diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
| commit | a68a7f42b02ad0260220d94f36ab61c772db071a (patch) | |
| tree | 620b763cd24fbfc1259f00ccb005217914af0c6f /release/datafiles | |
| parent | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (diff) | |
| parent | 15215493bf9d1d08e650109e6eb6189fc76e289e (diff) | |
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Diffstat (limited to 'release/datafiles')
| -rw-r--r-- | release/datafiles/preview.blend | bin | 459544 -> 433792 bytes |
| -rw-r--r-- | release/datafiles/prvicons | bin | 0 -> 13732 bytes |
| -rw-r--r-- | release/datafiles/splash.jpg | bin | 0 -> 84581 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/preview.blend b/release/datafiles/preview.blend Binary files differindex 8d67a88f679..9e09d579b2b 100644 --- a/release/datafiles/preview.blend +++ b/release/datafiles/preview.blend diff --git a/release/datafiles/prvicons b/release/datafiles/prvicons Binary files differnew file mode 100644 index 00000000000..de3980f9676 --- /dev/null +++ b/release/datafiles/prvicons diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg Binary files differnew file mode 100644 index 00000000000..243e779273d --- /dev/null +++ b/release/datafiles/splash.jpg |
