diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
| commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
| tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /tests/regression/opencsgtest | |
| parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/opencsgtest')
| -rw-r--r-- | tests/regression/opencsgtest/color-tests-expected.png | bin | 10950 -> 10389 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/cylinder-tests-expected.png | bin | 13165 -> 11612 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/example010-expected.png | bin | 33501 -> 29480 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/example015-expected.png | bin | 8632 -> 8542 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/example021-expected.png | bin | 20930 -> 20220 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/intersection-tests-expected.png | bin | 8069 -> 7273 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/use-tests-expected.png | bin | 0 -> 11165 bytes |
7 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 82ba36a..5b35312 100644 --- a/tests/regression/opencsgtest/color-tests-expected.png +++ b/tests/regression/opencsgtest/color-tests-expected.png diff --git a/tests/regression/opencsgtest/cylinder-tests-expected.png b/tests/regression/opencsgtest/cylinder-tests-expected.png Binary files differindex 17c10b8..4c7ab79 100644 --- a/tests/regression/opencsgtest/cylinder-tests-expected.png +++ b/tests/regression/opencsgtest/cylinder-tests-expected.png diff --git a/tests/regression/opencsgtest/example010-expected.png b/tests/regression/opencsgtest/example010-expected.png Binary files differindex 3a4ba27..0616f87 100644 --- a/tests/regression/opencsgtest/example010-expected.png +++ b/tests/regression/opencsgtest/example010-expected.png diff --git a/tests/regression/opencsgtest/example015-expected.png b/tests/regression/opencsgtest/example015-expected.png Binary files differindex 1a1c869..78ec3d7 100644 --- a/tests/regression/opencsgtest/example015-expected.png +++ b/tests/regression/opencsgtest/example015-expected.png diff --git a/tests/regression/opencsgtest/example021-expected.png b/tests/regression/opencsgtest/example021-expected.png Binary files differindex 675e57b..bf3a281 100644 --- a/tests/regression/opencsgtest/example021-expected.png +++ b/tests/regression/opencsgtest/example021-expected.png diff --git a/tests/regression/opencsgtest/intersection-tests-expected.png b/tests/regression/opencsgtest/intersection-tests-expected.png Binary files differindex fc23560..772e2dc 100644 --- a/tests/regression/opencsgtest/intersection-tests-expected.png +++ b/tests/regression/opencsgtest/intersection-tests-expected.png diff --git a/tests/regression/opencsgtest/use-tests-expected.png b/tests/regression/opencsgtest/use-tests-expected.png Binary files differnew file mode 100644 index 0000000..8a85ad5 --- /dev/null +++ b/tests/regression/opencsgtest/use-tests-expected.png |
