NissimHadar 000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork		2018-03-02 08:07:01 -08:00
..
animation
audio	Fast approximation of the azimuth parallax correction	2018-02-28 04:44:20 -08:00
audio-client	Merge pull request #12464 from jherico/android_dev	2018-03-01 17:22:34 -08:00
auto-updater
avatars
avatars-renderer	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting	2018-02-27 07:53:25 -08:00
baking
controllers
display-plugins
embedded-webserver
entities	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
fbx
gl
gpu	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
gpu-gl
gpu-gles
graphics	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
graphics-scripting	* remove unneeded Q_DECLARE_METATYPEs	2018-02-26 19:07:55 -05:00
image
input-plugins
ktx
midi
model-networking
networking	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
octree	Fix writeSubclassData in octree data	2018-02-26 17:06:25 -08:00
physics
plugins
pointers
procedural
qml	Fixing android errors	2018-02-26 12:32:57 -08:00
recording
render	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
script-engine
shared	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
task
trackers
ui	PR feedback	2018-02-27 09:11:40 -08:00
ui-plugins
workload