Anthony J. Thibault 2667fe3c24 Merge branch 'master' into tony/avatar-on-moving-platform		2016-02-08 14:32:46 -08:00
..
external
i18n
icon
resources	Merge pull request #7040 from hyperlogic/tony/landing-animation	2016-02-08 11:38:12 -08:00
src	Merge branch 'master' into tony/avatar-on-moving-platform	2016-02-08 14:32:46 -08:00
ui	Killing the old preferences dialog	2016-01-22 19:24:38 -08:00
CMakeLists.txt	fixing accidental commit of leap motion disabling.	2016-01-22 20:27:23 -08:00