diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-02 06:57:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-02 06:57:36 +0400 |
| commit | b64f35227033adf229a0fd2a717d856acb11973b (patch) | |
| tree | f945547f4062d5a94a70436cd1cb3bd3af9729d4 /source/blender/editors/space_buttons | |
| parent | 85242e9f6ce26c7c3dbb3d5f1a2745ac0ca4759a (diff) | |
| parent | ec710a29297d5fa7c9065760dbef322b02bbec01 (diff) | |
svn merge ^/trunk/blender -r43033:43062
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index c0ccaeaea90..6927a78332f 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |