David Capello 361a3084fd Merge branch 'new-workspace'
Conflicts:
	src/app/commands/cmd_open_file.cpp

Fixes:
	src/app/ui/timeline.cpp
2015-03-04 22:41:34 -03:00
..
2014-08-18 23:51:57 -03:00
2014-08-29 13:14:13 -04:00
2015-03-04 22:41:34 -03:00
2015-03-04 22:41:34 -03:00
2015-03-04 22:41:34 -03:00