 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 |
|
|
sandriek
|
8e6e091390
|
opslaan en ophalen
het ophalen werkt en is met een file opener.
het opslaan is met een timer op het moment.
er zit een file bij die data van het opslaan bevat.
|
2015-09-17 15:14:14 +02:00 |
|
 Aareschluchtje
|
84cded4d6b
|
Bug fixes
|
2015-09-14 12:05:27 +02:00 |
|
|
sandriek
|
17f72ca63a
|
opslaan
opslaan
|
2015-09-14 11:40:32 +02:00 |
|
|
Aareschluchtje
|
54dfa7131b
|
Copied files from ErgometerUitlezer
|
2015-09-14 11:23:46 +02:00 |
|
|
sandriek
|
f9b4eb9627
|
First Commit
|
2015-09-07 12:01:24 +02:00 |
|