| commit | 4f9efba27f479a4866b595c8e8c506224a887808 | |
| author | Steffen Prohaska <prohaska@zib.de> | |
| Thu, 25 Dec 2008 11:26:57 +0000 (25 12:26 +0100) | ||
| committer | Steffen Prohaska <prohaska@zib.de> | |
| Sat, 27 Dec 2008 09:46:47 +0000 (27 10:46 +0100) | ||
| tree | 2283679aaef665b3312f6e54da8d2a0b676f8fb0 | treesnapshot (tar.gz zip) |
| parent | 79d147e04185f6484e8a1226bb6263c480041222 | commitdiff |
| parent | e8d0d369da5a9bb6e76846251f27e0f384f490ec | commitdiff |
Merge commit 'spr/prefix-relocate-v4' into devel
Conflicts:
Makefile
daemon.c
exec_cmd.c
Conflicts:
Makefile
daemon.c
exec_cmd.c
| Makefile | diff1 | diff2 | blobhistory |