Melanie
3589acdab1
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
..
2013-10-12 16:33:45 -05:00
2013-10-15 11:55:08 -05:00
2013-11-03 21:34:36 +00:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-16 21:58:22 -05:00
2013-10-16 21:20:11 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-16 21:20:11 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-11-23 19:13:22 +00:00
2013-11-03 21:34:36 +00:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00
2013-10-12 16:33:45 -05:00