Brad Davis 80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD		2015-10-15 12:27:53 -07:00
..
src	Merge pull request #6026 from birarda/qt-polling-env	2015-10-15 09:58:32 -07:00
CMakeLists.txt	Fix broken assignment-client build	2015-10-14 17:07:10 -07:00