Avans/ErgometerApplication
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6 Commits 2 Branches 0 Tags
81252a2d0cbe3b777975200d0563b10e220b09c1
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
sandriek 81252a2d0c Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	ErgometerApplication/.vs/ErgometerApplication/v14/.suo
	ErgometerApplication/ErgometerApplication/Ergometer.cs

	ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe

	ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb

	ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt

	ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache

	ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache

	ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe

	ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb
2015-09-17 15:18:48 +02:00
ErgometerApplication
Merge remote-tracking branch 'origin/develop' into develop
2015-09-17 15:18:48 +02:00
S
Description
No description provided
3 MiB
Languages
C# 100%