mirror of
https://github.com/aseprite/aseprite.git
synced 2024-12-25 06:19:32 +00:00
Merge branch '1.0'
Conflicts: .gitmodules
This commit is contained in:
commit
cd2531855f
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,6 +1,6 @@
|
||||
[submodule "third_party/pixman"]
|
||||
path = third_party/pixman
|
||||
url = git@github.com:aseprite/pixman.git
|
||||
url = https://github.com/aseprite/pixman.git
|
||||
[submodule "third_party/simpleini"]
|
||||
path = third_party/simpleini
|
||||
url = git@github.com:aseprite/simpleini.git
|
||||
|
Loading…
Reference in New Issue
Block a user