Stephen Birarda 5dc48dc9dc resolve conflicts on merge with upstream/master		2015-11-17 17:04:12 -08:00
..
external	Moving SDL2, Sixense and Faceshift to external projects	2015-10-30 00:57:51 -07:00
i18n
icon
resources	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
src	resolve conflicts on merge with upstream/master	2015-11-17 17:04:12 -08:00
ui
CMakeLists.txt	Add recording classes	2015-11-06 11:14:46 -08:00