Commit graph

3 commits

Author SHA1 Message Date
Howard Stearns
b8ca604bf8 Checkpoint before GenericThread. 2015-08-25 16:17:50 -07:00
Howard Stearns
2819f3ac1b constant 2015-08-18 16:39:30 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
And update with current code.
2015-08-18 15:35:37 -07:00