ea5c02edc0
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 |
||
---|---|---|
.settings | ||
src/org/hwo/pulscounter | ||
.classpath | ||
.gitignore | ||
.project | ||
postgresql-9.1-901.jdbc4.jar |