David Capello 0a1dfe0633 Merge branch 'onionskin' ... Conflicts: src/app/ui/editor/play_state.cpp src/render/render.cpp third_party/gtest		2015-06-05 15:53:15 -03:00
..
fonts
icons
palettes	Added color names	2014-08-29 13:14:13 -04:00
skins/default	Move palette menu to color bar options button	2015-05-08 14:36:54 -03:00
widgets	Merge branch 'onionskin'	2015-06-05 15:53:15 -03:00
www
convmatr.def	Add new matrices to create an outline in RGB transparent layers	2015-04-16 11:08:35 -03:00
gui.xml	Minor change in Palette menu	2015-05-21 11:15:44 -03:00
pref.xml	Merge branch 'onionskin'	2015-06-05 15:53:15 -03:00