Merging pepper to trunk at revision 39791.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 30 Aug 2011 09:15:55 +0000 (09:15 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 30 Aug 2011 09:15:55 +0000 (09:15 +0000)
commit9424b1ceff992f420fe6315acabfb7138cd0026e
tree2f19cac8af2ad32852cf9c46cb542e14fabe8d9b
parentd049a722fea3d150fbfad06ffdbbb5c150717134
parent43ab8e86247b7889d16d915b4f370ceb618aaad4
Merging pepper to trunk at revision 39791.

Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h