overte/cmake
Thijs Wenker e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216
Conflicts:
	interface/CMakeLists.txt
2014-12-19 13:53:33 +01:00
..
macros remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
modules Merge branch 'master' of https://github.com/worklist/hifi into 20216 2014-12-19 13:53:33 +01:00