overte-JulianGro/shared
ZappoMan 23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
2013-03-25 22:51:59 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi 2013-03-25 22:51:59 -07:00
CMakeLists.txt shared library should link pthreads on UNIX 2013-02-22 13:47:25 -08:00