diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-11-29 03:53:23 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-29 03:53:23 +0300 |
| commit | abd16aac5af56a37a3435b94039d77b74223abab (patch) | |
| tree | 47ba926d0e8e2c3a903a5d2f1b8290d274cb381c /source/blender/editors/object/SConscript | |
| parent | 3d0db91f820a509bc6c93718499ffe8ff49515d3 (diff) | |
| parent | d459c9c9abd2ad0819e5c096f6e3e5a93a02a219 (diff) | |
ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
Diffstat (limited to 'source/blender/editors/object/SConscript')
| -rw-r--r-- | source/blender/editors/object/SConscript | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index a6f034c9c33..9ac2b139330 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -5,7 +5,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' -incs += ' #/intern/guardedalloc' incs += ' ../../makesrna ../../python ../../ikplugin ../../bmesh' defs = [] |