Commit Graph

2 Commits

Author SHA1 Message Date
Melanie
dd416298f1 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-11-04 22:37:28 +00:00
Mic Bowman
91312daeb2 Moving ScriptModuleComms into the CoreModules tree. 2012-09-17 09:04:54 -07:00