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
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in