diff options
author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /tests/.gitignore | |
parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'tests/.gitignore')
-rw-r--r-- | tests/.gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index ba02d4c..4dc4e40 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -19,4 +19,6 @@ out.png /echotest /opencsgtest /throwntogethertest -/yee_compare +/cgalstlsanitytest +/sysinfo.txt +/CTestCustom.cmake
\ No newline at end of file |