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

..

advanced_mode.xml

…

canvas_size.xml

…

cel_properties.xml

…

color_curve.xml

…

convolution_matrix.xml

…

despeckle.xml

…

duplicate_sprite.xml

…

export_sprite_sheet.xml

…

file_selector.xml

…

frame_duration.xml

…

gif_options.xml

…

goto_frame.xml

…

grid_settings.xml

…

jpeg_options.xml

…

keyboard_shortcuts.xml

…

layer_properties.xml

…

main_window.xml

…

new_layer.xml

…

new_sprite.xml

…

options.xml

…

palette_popup.xml

…

replace_color.xml

…

select_accelerator.xml

…

send_crash.xml

…

sprite_properties.xml

…

sprite_size.xml

…

timeline_conf.xml

…

tools_configuration.xml

…