Go to file
Harald Wolff ea5c02edc0 Merge branch 'master' of schwann.lupus:/git/java/org.hwo.pulscounter
Conflicts:
	.classpath
	postgresql-9.1-901.jdbc4.jar
	src/org/hwo/pulscounter/NewPulsCounterDevice.java
	src/org/hwo/pulscounter/PulsCounter.java
	src/org/hwo/pulscounter/elements/WorkShiftRecord.java
	src/org/hwo/pulscounter/ui/PulsCounterWindow.java
2016-09-06 16:55:17 +02:00
.settings Alpha für 16/C 2016-09-06 16:49:11 +02:00
src/org/hwo/pulscounter Merge branch 'master' of schwann.lupus:/git/java/org.hwo.pulscounter 2016-09-06 16:55:17 +02:00
.classpath Alpha für 16/C 2016-09-06 16:49:11 +02:00
.gitignore Alpha für 16/C 2016-09-06 16:49:11 +02:00
.project Update 2015-05-05 16:05:22 +02:00
postgresql-9.1-901.jdbc4.jar Alpha für 16/C 2016-09-06 16:49:11 +02:00