Andrzej Kapolka
|
75eee4bcbd
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
|
2013-05-13 21:23:00 -07:00 |
|
Andrzej Kapolka
|
e0388515a4
|
Massive migration from GLUT/globals to Qt/class members. Mostly there.
|
2013-05-13 21:11:54 -07:00 |
|
Stephen Birarda
|
b6925edbe8
|
add a PairingHandler to send pair requests to the pairing server
|
2013-05-13 17:34:34 -07:00 |
|
Andrzej Kapolka
|
012c2c9c9f
|
Changed "Quit" menu item to "Test" (Quit should apparently be added
automatically).
|
2013-05-10 12:11:32 -07:00 |
|
Andrzej Kapolka
|
5a113fd546
|
Added a stub for a Qt application class that creates a menu (which, since it's
unparented, will only appear on OS X) with a test item connected to a slot.
|
2013-05-10 12:07:47 -07:00 |
|