diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-28 23:57:52 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-28 23:57:52 (GMT) |
| commit | 2b3c140bd264f8a5cf94d3fa83f875933fbb4928 (patch) | |
| tree | 91a96f286fe13d6530de513faa53249a669da44c /tests/regression/opencsgtest | |
| parent | 6c3ce9934755bcc579ac30104d651608c2c71622 (diff) | |
| parent | da08b50c03418110a74a6f2667be1d916b607b87 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
tests/opencsgtest.cc
Diffstat (limited to 'tests/regression/opencsgtest')
| -rw-r--r-- | tests/regression/opencsgtest/highlight-and-background-modifier-expected.png | bin | 0 -> 21649 bytes |
| -rw-r--r-- | tests/regression/opencsgtest/include-tests-expected.png | bin | 0 -> 11994 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png b/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png Binary files differnew file mode 100644 index 0000000..72d03c3 --- /dev/null +++ b/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png diff --git a/tests/regression/opencsgtest/include-tests-expected.png b/tests/regression/opencsgtest/include-tests-expected.png Binary files differnew file mode 100644 index 0000000..62be03c --- /dev/null +++ b/tests/regression/opencsgtest/include-tests-expected.png |
