root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.0' 

Conflicts:
	.gitmodules
This commit is contained in:
David Capello 2014-10-30 11:33:09 -03:00
parent 39b8e034b5 01c26e5a18
commit cd2531855f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "third_party/pixman"] [submodule "third_party/pixman"]
path = 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"] [submodule "third_party/simpleini"]
path = third_party/simpleini path = third_party/simpleini
url = git@github.com:aseprite/simpleini.git url = git@github.com:aseprite/simpleini.git