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 | 181ee880f53e1b10fce89e74ba429e23382809c1 (patch) | |
| tree | 2f0f392274a6794f7962ec9dbd13e719e48ca5f7 | |
| parent | cdbc8c537320e3e534694311516ac398ea501600 (diff) | |
| parent | 5ad8c950f59472d1d0ad21c13320024889fe2e46 (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
.gitmodules
oncology/dpfhack_display
126 files changed, 850 insertions, 68057 deletions
@@ -3,6 +3,7 @@ a.out *.o *.a .svn/ +/god/Reaktor/tmp/ /bin/ /node/src /node/out 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/Refactory/Makefile b/Refactory/Makefile new file mode 100644 index 00000000..57b983df --- /dev/null +++ b/Refactory/Makefile @@ -0,0 +1,2 @@ +install: + ln -snf $$PWD/bin/git-clone-into ../bin/ diff --git a/cholerab/AGENDA.cccamp11 b/cholerab/AGENDA index 7bdf02a3..8c80be0d 100644 --- a/cholerab/AGENDA.cccamp11 +++ b/cholerab/AGENDA @@ -16,8 +16,6 @@ |