diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-23 00:31:46 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-23 00:31:46 +0400 |
| commit | f0d5abfcb2b54f6fd7a24220e81e0c88a914d87f (patch) | |
| tree | 328a631d447ea7c7be2a757d092065c721090f82 /doc | |
| parent | 1d529d83a0693693878749110a05d8b0fa929d0f (diff) | |
| parent | 6a374d266d8213629f74a9f4c9a4984ddf59ef4c (diff) | |
Merging trunk up to r39637.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build_systems/scons-dev.txt | 2 | ||||
| -rw-r--r-- | doc/build_systems/scons.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build_systems/scons-dev.txt b/doc/build_systems/scons-dev.txt index d13ea7c036f..ca1b3924804 100644 --- a/doc/build_systems/scons-dev.txt +++ b/doc/build_systems/scons-dev.txt @@ -27,7 +27,7 @@ $Id$ filenames have the form (platform)-config.py, where platform one of: * darwin - * linux2 + * linux * win32-mingw * win32-vc diff --git a/doc/build_systems/scons.txt b/doc/build_systems/scons.txt index b4d9a905885..9d018bcc790 100644 --- a/doc/build_systems/scons.txt +++ b/doc/build_systems/scons.txt @@ -76,7 +76,7 @@ $Id$ $BLENDERHOME/config. Your platform specific defaults are in (platform)-config.py, where platform is one of: - - linux2, for machines running Linux + - linux, for machines running Linux - win32-vc, for Windows machines, compiling with a Microsoft compiler - win32-mingw, for Windows machines, compiling with the MingW compiler - darwin, for OS X machines |