diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /tests/regression/opencsgtest | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/opencsgtest')
| -rw-r--r-- | tests/regression/opencsgtest/color-tests-expected.png | bin | 11055 -> 10950 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/hull2-tests-expected.png | bin | 8078 -> 7924 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/sphere-tests-expected.png | bin | 18276 -> 18173 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/testcolornames-expected.png | bin | 20822 -> 24453 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/tests/regression/opencsgtest/color-tests-expected.png b/tests/regression/opencsgtest/color-tests-expected.png Binary files differindex b2ef8dd..82ba36a 100644 --- a/tests/regression/opencsgtest/color-tests-expected.png +++ b/tests/regression/opencsgtest/color-tests-expected.png diff --git a/tests/regression/opencsgtest/hull2-tests-expected.png b/tests/regression/opencsgtest/hull2-tests-expected.png Binary files differindex 66ee6b2..46b266b 100644 --- a/tests/regression/opencsgtest/hull2-tests-expected.png +++ b/tests/regression/opencsgtest/hull2-tests-expected.png diff --git a/tests/regression/opencsgtest/sphere-tests-expected.png b/tests/regression/opencsgtest/sphere-tests-expected.png Binary files differindex 06161f3..d11e3bf 100644 --- a/tests/regression/opencsgtest/sphere-tests-expected.png +++ b/tests/regression/opencsgtest/sphere-tests-expected.png diff --git a/tests/regression/opencsgtest/testcolornames-expected.png b/tests/regression/opencsgtest/testcolornames-expected.png Binary files differindex 6fc6569..6c1b107 100644 --- a/tests/regression/opencsgtest/testcolornames-expected.png +++ b/tests/regression/opencsgtest/testcolornames-expected.png |
