diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 13:15:55 +0400 |
| commit | 9424b1ceff992f420fe6315acabfb7138cd0026e (patch) | |
| tree | 2f19cac8af2ad32852cf9c46cb542e14fabe8d9b /source/gameengine/Converter/CMakeLists.txt | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
| parent | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (diff) | |
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!
Diffstat (limited to 'source/gameengine/Converter/CMakeLists.txt')
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 45a7701d404..3a217ce9d74 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -51,6 +51,7 @@ set(INC ../../blender/makesrna ../../blender/windowmanager ../../../extern/bullet2/src + ../../../extern/Eigen2 ../../../intern/container ../../../intern/guardedalloc ../../../intern/moto/include |