Howard Stearns 7bd395a4d4 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe		2015-09-22 15:06:43 -07:00
..
external	Update readme.txt	2015-09-15 00:29:12 +02:00
i18n
icon
resources	Merge pull request #5862 from howard-stearns/user-specified-animation-graph	2015-09-22 10:48:28 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe	2015-09-22 15:06:43 -07:00
ui	Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec.	2015-09-21 10:26:04 -07:00
CMakeLists.txt	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00