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
..
2013-01-27 12:13:13 -03:00
2013-01-27 12:13:13 -03:00
2013-01-27 12:13:13 -03:00
2013-01-27 12:13:13 -03:00
2013-01-27 12:13:13 -03:00