diff options
| author | Melanie | 2014-01-28 21:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 21:02:20 +0000 |
| commit | c6e9db58669d773c85041db99b19b942f70324f7 (patch) | |
| tree | 99f69fb669332cff69a45ce6f7473aed6d965a0d /OpenSim/Data/MySQL/MySQLXAssetData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.zip opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.gz opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.bz2 opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXAssetData.cs')
0 files changed, 0 insertions, 0 deletions