Stephen Birarda ede32b5f1a resolve conflicts on merge with upstream master		2014-03-05 15:31:00 -08:00
..
external	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00
resources	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
src	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
interface.icns
InterfaceConfig.h.in	Adding build sequence to Interface build	2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in	Checkpoint	2014-01-13 07:37:47 -06:00