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

..

fonts

Renamed exchange_colors to switch_colors

2008-03-15 01:54:45 +00:00

icons

Add document icon

2014-08-18 23:51:57 -03:00

palettes

Added color names

2014-08-29 13:14:13 -04:00

skins/default

Remove old layer icons from skin sprite sheet

2015-01-18 22:45:58 -03:00

widgets

Merge branch '1.0'

2015-01-29 12:18:13 -03:00

www

Add experimental webserver API and home page

2013-04-01 19:37:02 -03:00

convmatr.def

Convert all newline to LF style and remove all tabs.

2012-01-05 19:45:03 -03:00

gui.xml

Merge branch '1.0'

2015-01-29 12:18:13 -03:00

pref.xml

Replace undo impl: replace undoers with cmds

2015-01-18 22:05:33 -03:00