« back to all changes in this revision
Viewing changes to intern/boolop/intern/BOP_Merge.h
- Committer: Package Import Robot
- Date: 2012-04-28 12:11:12 UTC
- mto: (14.1.6 experimental) (1.5.1)
- mto: This revision was merged to the branch mainline in revision 34.
- Revision ID: package-import@ubuntu.com-20120428121112-2zi0vp8b6vejda8i
Import upstream version 2.63
- files added:
- build_files/scons/config/win64-mingw-config.py
- extern/libmv/third_party/gflags/gflags
- extern/xdnd
- intern/utfconv
- release/datafiles/locale/hr
- release/datafiles/locale/hr/LC_MESSAGES
- release/datafiles/locale/pt
- release/datafiles/locale/pt/LC_MESSAGES
- release/datafiles/locale/tr
- release/datafiles/locale/tr/LC_MESSAGES
- release/datafiles/locale/uk
- release/datafiles/locale/uk/LC_MESSAGES
- release/scripts/addons_contrib/add_curve_objects
- release/scripts/addons_contrib/add_mesh_chain_rope
- release/scripts/addons_contrib/io_scene_cod
- release/scripts/addons_contrib/presets/keyconfig
- release/scripts/presets/fluid
- source/blender/bmesh
- source/blender/bmesh/intern
- source/blender/bmesh/operators
- source/blender/bmesh/tools
- source/blender/python/bmesh
- files removed:
- extern/libmv/libmv/tracking/sad.cc
- release/datafiles/locale/es_MX
- release/datafiles/locale/es_MX/LC_MESSAGES
- release/datafiles/locale/pt_BR
- release/datafiles/locale/pt_BR/LC_MESSAGES
- source/gameengine/PyDoc
- files modified:
- CMakeLists.txt
added
removed
intern/boolop/intern/BOP_Merge.h
