mirror of
https://github.com/aseprite/aseprite.git
synced 2025-02-04 06:40:07 +00:00
06636fd16e
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