diff options
| author | EUcancER <root@euer.krebsco.de> | 2011-08-31 12:52:15 +0200 |
|---|---|---|
| committer | EUcancER <root@euer.krebsco.de> | 2011-08-31 12:52:15 +0200 |
| commit | a2e4ac21444fd9af436039ba921e809cfca59ea2 (patch) | |
| tree | e12c692527bc9b2b373cf0a4956f0ff458045cd7 /.gitmodules | |
| parent | efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff) | |
| parent | cf46dbc53b36772fb0461b9451337c118e705c55 (diff) | |
Gigantor Merge!
Conflicts:
cholerab/news/Candidate - add Ante scriptum
cholerab/shirts/bestellliste - merged as theirs
oncology/dpfhack_display - now a submodule
add bug-fixing for adv_graphgen, as well as a Makefile
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index ed0cb4ed..cbc61522 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,9 @@ [submodule "submodules/github/tautologistics/node-htmlparser"] path = submodules/github/tautologistics/node-htmlparser url = https://github.com/tautologistics/node-htmlparser +[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 |