Merge branch 'master' of https://github.com/tetron/osgexport · tetron/osgexport@a6e841d · GitHub

Commit

Merge branch 'master' of https://github.com/tetron/osgexport

Browse files

Conflicts:
	blender-2.5/exporter/osg/__init__.py
	blender-2.5/exporter/osg/osgconf.py
	blender-2.5/exporter/osg/osgdata.py
	blender-2.5/exporter/osg/osgobject.py

Loading branch information

Peter Amstutz committed Apr 15, 2013

2 parents 98ac69f + 53fdb75 commit a6e841d