Stephen Birarda 80cf7b6c76 resolve conflicts on merge with upstream/master		2015-08-27 14:50:04 -07:00
..
external	Merge branch 'master' into 20639	2015-08-05 16:49:06 -07:00
i18n	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
icon
resources	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
src	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
ui	apperance => appearance	2015-08-13 14:42:37 -07:00
CMakeLists.txt	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00