diff options
author | BlueWall | 2011-04-21 19:08:31 -0400 |
---|---|---|
committer | BlueWall | 2011-04-21 19:08:31 -0400 |
commit | cbe49ed917aaef44b5811949bd50e6c6d74c3188 (patch) | |
tree | 53e2eae095e9744729a46f5bb6fe4db5e53eded9 /OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | |
parent | fix merge conflicts with OpenSimDefaults.ini (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.zip opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.gz opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.bz2 opensim-SC_OLD-cbe49ed917aaef44b5811949bd50e6c6d74c3188.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LLSDDiscovery.cs')
0 files changed, 0 insertions, 0 deletions