Commit Graph

2 Commits

Author SHA1 Message Date
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
Siana Gearz
955ca21298 OpenSim compatible prim backup 2011-04-19 01:33:09 +02:00