You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
7 years ago
.settings Alpha für 16/C 7 years ago
src/org/hwo/pulscounter Merge branch 'master' of schwann.lupus:/git/java/org.hwo.pulscounter 7 years ago
.classpath Alpha für 16/C 7 years ago
.gitignore Alpha für 16/C 7 years ago
.project Update 8 years ago
postgresql-9.1-901.jdbc4.jar Alpha für 16/C 7 years ago