mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-04 05:50:15 +00:00
39b8e034b5
Conflicts: .gitmodules CMakeLists.txt src/CMakeLists.txt src/app/app.h src/app/app_menus.cpp src/app/commands/cmd_move_mask.cpp src/app/commands/cmd_rotate.cpp src/app/modules/gui.cpp src/doc/resize_image_tests.cpp src/ui/accelerator.cpp third_party/CMakeLists.txt
7 lines
213 B
Plaintext
7 lines
213 B
Plaintext
[submodule "third_party/pixman"]
|
|
path = third_party/pixman
|
|
url = git@github.com:aseprite/pixman.git
|
|
[submodule "third_party/simpleini"]
|
|
path = third_party/simpleini
|
|
url = git@github.com:aseprite/simpleini.git
|