diff options
author | Melanie | 2010-11-05 13:34:54 +0000 |
---|---|---|
committer | Melanie | 2010-11-05 13:34:54 +0000 |
commit | 6bac92db802553c57a5d9c9cb1db788934eb93ff (patch) | |
tree | 74f2f46d090df123ae823a5bb56fa4a42eca30e7 /Makefile | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Fix child prims returning after being unlinked and deleted where the root is (diff) | |
download | opensim-SC_OLD-6bac92db802553c57a5d9c9cb1db788934eb93ff.zip opensim-SC_OLD-6bac92db802553c57a5d9c9cb1db788934eb93ff.tar.gz opensim-SC_OLD-6bac92db802553c57a5d9c9cb1db788934eb93ff.tar.bz2 opensim-SC_OLD-6bac92db802553c57a5d9c9cb1db788934eb93ff.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions