diff options
| author | makefu <github@syntax-fehler.de> | 2011-08-30 11:25:00 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2011-08-30 11:25:00 +0200 |
| commit | bbf2bc45f02e8795b8cda6dde262226cd658bfd4 (patch) | |
| tree | 4089d3fd6ac40c0d5a91dae46a444d4c62139a22 /.gitmodules | |
| parent | cd4f8b3394e02bcb7d86d53d1b98b4b4b868b78b (diff) | |
| parent | b1f0a73e5810aed4fd78aad2bb55a8a67f76df5d (diff) | |
Merge branch 'master' of github.com:krebscode/painload into punani_files
Conflicts:
.gitmodules
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 3677b710..cbc61522 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +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 |