diff options
| author |  darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /.gitmodules | |
| parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
| parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) | |
Fix merge conflicts
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index d7201387..a9e0a5c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "externals/inih/inih"] path = externals/inih/inih url = https://github.com/svn2github/inih +[submodule "externals/boost"] + path = externals/boost + url = https://github.com/citra-emu/ext-boost.git +[submodule "externals/nihstro"] + path = externals/nihstro + url = https://github.com/neobrain/nihstro.git |