Sam Gateau 88ecfe7895 Merge pull request #12464 from jherico/android_dev ... Android Master		2018-03-01 17:22:34 -08:00
..
animation	more logging for fogbugz 11748	2018-02-20 15:45:47 -08:00
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	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
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	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
embedded-webserver	Fix ambiguous int64_t in HTTPConnection	2018-02-16 13:57:38 -08:00
entities	Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers	2018-03-01 14:56:29 -08:00
entities-renderer	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
fbx	* remove Model_temporary_hack	2018-02-26 04:58:22 -05:00
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 remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
graphics-scripting	* remove unneeded Q_DECLARE_METATYPEs	2018-02-26 19:07:55 -05:00
image	Fix BGR/RGB bug on GLES	2018-02-22 14:11:05 -08:00
input-plugins	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
ktx
midi
model-networking	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
networking	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -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 remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
script-engine	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
shared	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
task	A bit more explanations to the Task Flow class	2018-02-15 11:55:16 -08:00
trackers
ui	PR feedback	2018-02-27 09:11:40 -08:00
ui-plugins
workload