Sam Gateau 8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow		2015-07-29 14:04:20 -07:00
..
android
externals	Merge branch 'master' into maggie	2015-07-21 19:21:45 -04:00
macros	Reverted macro naming convention	2015-07-02 17:41:38 -07:00
modules	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-29 14:04:20 -07:00
templates