diff options
| author | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
|---|---|---|
| committer | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
| commit | b5268ab9207f02574abe8d6f5407e25f4a86365a (patch) | |
| tree | adce2892dd4c07781f2db42854e30fc25dba8b15 /.gitmodules | |
| parent | da3b8dc19d685eb15c23d345aa51afb25b7dce58 (diff) | |
| parent | 3016f72851213659656c6ce2cd2dcee6625b06bb (diff) | |
Merge remote-tracking branch 'kanzure/master' into mergetastic
Conflicts:
main.asm
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..1f76b537 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "extras"] + path = extras + url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git |