mirror of
https://github.com/aseprite/aseprite.git
synced 2025-01-27 06:35:16 +00:00
f1cd3bbbe2
Conflicts: src/app/ui/editor/standby_state.cpp src/app/ui/editor/tool_loop_impl.cpp