Ryan Huffman 196161fe93 Merge pull request #66 from birarda/console-dev ... some initial packaging work and console fixes		2016-01-14 10:17:24 -08:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into console	2016-01-07 16:02:32 -08:00
CMakeLists.txt	some macro renaming and cleanup	2016-01-04 10:26:37 -08:00