forked from bartvdbraak/blender
a42bf45333
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.
Its also too close to release to be making these kinds of changes.
commands used:
# reverse merge
svn merge -r36073:36072 .
# for some reason this gave a lot of property changes
svn revert `svn st | grep "^ M" | awk '{print $2}'`
# reverse merging didn't work here, removing while dir.
svn rm extern/eltopo/
# manually fixed conflict in
# ./source/blenderplayer/CMakeLists.txt
#
# also manually removed 2 lines from
# ./CMakeLists.txt
|
||
|---|---|---|
| .. | ||
| binreloc | ||
| bullet2 | ||
| Eigen2 | ||
| glew | ||
| libopenjpeg | ||
| libredcode | ||
| lzma | ||
| lzo | ||
| CMakeLists.txt | ||
| SConscript | ||