From b2d864b10c9924861f9684bfc9f232f7d6c5cadb Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 29 Aug 2011 13:30:51 +0200 Subject: fix dpfhack_display now as submodule Conflicts: .gitmodules oncology/dpfhack_display --- .gitmodules | 3 +++ oncology/dpfhack_display | 1 + submodules/github/makefu/dpfhack_display | 1 + 3 files changed, 5 insertions(+) create mode 120000 oncology/dpfhack_display create mode 160000 submodules/github/makefu/dpfhack_display 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 index 00000000..c66acd31 --- /dev/null +++ b/submodules/github/makefu/dpfhack_display @@ -0,0 +1 @@ +Subproject commit c66acd31125dc18bc2638569d6ba081f21bcef50 -- cgit v1.2.3