diff options
| author | Melanie | 2013-01-31 02:53:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 02:53:11 +0000 |
| commit | 9a4de546fe92105c570d6861377ec47d32b4186e (patch) | |
| tree | edfb86074fc7c78126203a2c05a38e260c0d4076 /TESTING.txt | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add JsonTestStore to determine if a JsonStore is associated with (diff) | |
| download | opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.zip opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2 opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'TESTING.txt')
0 files changed, 0 insertions, 0 deletions