diff options
| author | Melanie | 2010-08-26 00:11:07 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-26 00:11:07 +0100 |
| commit | fc8d2be632c754338b136fe4a3d57c40b0190ce7 (patch) | |
| tree | 94bb954bdf258e968e8c337ad1da57ba9fa68b91 /.gitignore | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.zip opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.gz opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.bz2 opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions