resolved conflict state with HEAD r14096

Browse Source

blenderbuttons still bad

not let this compile

...

This commit is contained in:

JLuc Peuriere

2008-03-13 23:54:02 +00:00

parent 526d0bec47 15215493bf

commit a68a7f42b0

1174 changed files with 179989 additions and 80340 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1319

source/blender/src/header_view3d.c

File diff suppressed because it is too large Load Diff