David Capello f1cd3bbbe2 Merge branch '1.0'
Conflicts:
	src/app/ui/editor/standby_state.cpp
	src/app/ui/editor/tool_loop_impl.cpp
2014-11-24 21:53:10 -03:00
..
2014-08-18 23:51:57 -03:00
2014-08-29 13:14:13 -04:00
2014-11-24 21:53:10 -03:00
2014-11-20 21:48:13 -03:00