OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Data/MSSQL/MSSQLSimulationData.cs
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/Null/NullSimulationData.cs
	OpenSim/Data/SQLite/SQLiteSimulationData.cs
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
avinationmerge
Melanie 2012-08-15 18:58:15 +01:00
parent 44dc138d8b dc82ad0f7a
commit 90e4c3fece
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.txt
View File

@ -91,6 +91,7 @@ what it is today.
* Fly-Man
* Flyte Xevious
* Garmin Kawaguichi
* Gryc Ueusp
* Imaze Rhiano
* Intimidated
* Jeremy Bongio (IBM)