diff options
| author | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
| commit | bb2a234ba756eb600fb6f562e67500d511d4ab39 (patch) | |
| tree | c89b205e3ad2d20e3aa80ca525e0bbf1e01b4670 /.gitmodules | |
| parent | 8a6fd84c70618f5a435d2859b513de6de68dc0d1 (diff) | |
| parent | 4fb37da707279faf92cc8a054c646336f23dfdbe (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
.gitmodules
oncology/dpfhack_display
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 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 |