aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authornotaz2012-11-02 03:07:05 +0200
committernotaz2012-11-02 03:07:05 +0200
commit2857d72e4ca743bba3cf55e298949e24d97dff02 (patch)
tree3742f3cd7cb1c10fc42fc4b581fff9c4ead3d9ce /.gitmodules
parent0e53ec55691229fee1cbb7c23b305be6a59431c4 (diff)
parentbcb62992749a7f66e9a16a8022e090ff334c4424 (diff)
downloadpcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.gz
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.bz2
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.zip
Merge branch 'enhancement'
Conflicts: frontend/libretro.c
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 650250d..f93599e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "frontend/warm"]
+[submodule "libpicofe"]
+ path = frontend/libpicofe
+ url = git://notaz.gp2x.de/~notaz/libpicofe.git
+[submodule "warm"]
path = frontend/warm
url = git://notaz.gp2x.de/~notaz/warm.git