Context Navigation

← Previous Change
Next Change →

Changeset 11208 for OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB

Timestamp:

03/13/10 19:09:26 (3 years ago)

Author:

paulmartz

Message:

Merge 10664 to 2.8 branch (MSFBO workaround for OS X).

Location:

OpenSceneGraph/branches/OpenSceneGraph-2.8

Files:

: 4 modified

. (modified) (1 prop)
src/osgDB (modified) (1 prop)
src/osgDB/CMakeLists.txt (modified) (1 prop)
src/osgDB/DatabasePager.cpp (modified) (1 prop)

OpenSceneGraph/branches/OpenSceneGraph-2.8
- Property svn:mergeinfo set to /OpenSceneGraph/branches/OpenSceneGraph-2.8.2:10664

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB:10664
1	2	/OpenSceneGraph/trunk/src/osgDB:10150

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/CMakeLists.txt

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/CMakeLists.txt:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osgDB/CMakeLists.txt:9882
2	3	/OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9922,10150

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/DatabasePager.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:10054,10150

Download in other formats: