Commit graph

6 commits

Author SHA1 Message Date
Brad Davis
a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor
Conflicts:
	libraries/render-utils/src/MatrixStack.h
2015-04-27 10:59:57 -07:00
Brad Davis
3071be162a Coding standards 2015-04-26 20:11:27 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00