summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-08-29 13:30:51 +0200
committermakefu <github@syntax-fehler.de>2011-08-29 13:41:07 +0200
commitb2d864b10c9924861f9684bfc9f232f7d6c5cadb (patch)
tree6308a79222c7cfba65938bf9a021d5a490ef52b3
parent54a2aa662d8092ee471f6f9771d17c4f0406dd16 (diff)
fix dpfhack_display now as submodule
Conflicts: .gitmodules oncology/dpfhack_display
-rw-r--r--.gitmodules3
l---------oncology/dpfhack_display1
m---------submodules/github/makefu/dpfhack_display0
3 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index ab38c084..cbc61522 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
[submodule "krebsbeam/c-beam"]
path = krebsbeam/c-beam
url = git://dev.c-base.org/c-beam/c-beam.git
+[submodule "submodules/github/makefu/dpfhack_display"]
+ path = submodules/github/makefu/dpfhack_display
+ url = https://github.com/makefu/dpfhack_pearl
diff --git a/oncology/dpfhack_display b/oncology/dpfhack_display
new file mode 120000
index 00000000..9666b7bc
--- /dev/null
+++ b/oncology/dpfhack_display
@@ -0,0 +1 @@
+../submodules/github/makefu/dpfhack_display \ No newline at end of file
diff --git a/submodules/github/makefu/dpfhack_display b/submodules/github/makefu/dpfhack_display
new file mode 160000
+Subproject c66acd31125dc18bc2638569d6ba081f21bcef5