Permalink
Switch branches/tags
Nothing to show
Commits on Jun 27, 2011
  1. Added timetable

    Jonas Jongejan
    Jonas Jongejan committed Jun 27, 2011
Commits on Jun 25, 2011
  1. Added count of last hour

    Jonas Jongejan
    Jonas Jongejan committed Jun 25, 2011
  2. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 25, 2011
    Conflicts:
    	PeopleCounterServer/src/synth.cpp
  3. Fixed for train trip and removed the high start count

    Jonas Jongejan
    Jonas Jongejan committed Jun 25, 2011
Commits on Jun 12, 2011
  1. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  2. Tracker fix

    HalfdanJ committed Jun 12, 2011
  3. Connect to pc's

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  4. Number fun.

    Johan
    Johan committed Jun 12, 2011
  5. Added msgqueue.

    Johan
    Johan committed Jun 12, 2011
  6. Sound updated.

    Johan
    Johan committed Jun 12, 2011
  7. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  8. File saver

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  9. Gui update.

    Johan
    Johan committed Jun 12, 2011
  10. Updated people counter.

    Johan
    Johan committed Jun 12, 2011
  11. fixed xcode reference

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  12. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  13. Size of blob determinate number of people to add

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  14. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    HalfdanJ committed Jun 12, 2011
    Conflicts:
    	PeopleCounterSlave/src/tracker.cpp
  15. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
    Conflicts:
    	PeopleCounterServer/src/analyzer.cpp
    	PeopleCounterServer/src/gui.cpp
    	PeopleCounterServer/src/gui.h
  16. Analyze distance

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011
  17. Resolved conflict properly.

    Johan
    Johan committed Jun 12, 2011
  18. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Johan
    Johan committed Jun 12, 2011
    Conflicts:
    	PeopleCounterServer/src/analyzer.cpp
  19. Added simple speech synth person counter and button for adding person…

    Johan
    Johan committed Jun 12, 2011
    …s in debug.
  20. Cropping

    mrbichel committed Jun 12, 2011
  21. Merge branch 'master' of github.com:HalfdanJ/PeopleCounter

    Jonas Jongejan
    Jonas Jongejan committed Jun 12, 2011