Stephen Birarda 2408d909ba resolve conflicts on merge with upstream master		2014-02-20 12:12:29 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	resolve conflicts on merge with upstream/master	2014-02-20 10:14:36 -08:00
src	resolve conflicts on merge with upstream master	2014-02-20 12:12:29 -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	We need libc++, not libc++abi.	2014-02-19 12:03:14 -08:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in	Checkpoint	2014-01-13 07:37:47 -06:00