overte/interface
Andrzej Kapolka 5bbff6f63f Merge branch 'master' of https://github.com/worklist/hifi into opencv
Conflicts:
	interface/src/Balls.cpp
2013-06-21 14:40:47 -07:00
..
external Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-20 03:46:25 +02:00
resources Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:40:47 -07:00
CMakeLists.txt Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-20 03:46:25 +02:00
interface.icns
InterfaceConfig.h.in