David Capello 06636fd16e Merge branch '1.0'
Conflicts:
	src/app/file/gif_format.cpp
	src/app/file/gif_options.h
	src/app/ui/editor/moving_cel_state.cpp
	src/app/ui/editor/standby_state.cpp
	src/app/util/range_utils.cpp
2015-01-29 12:18: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
2013-01-27 12:13:13 -03:00
2015-01-20 09:31:20 -03:00