[cogl/cogl-1.16] Update .gitignore

[Neil Roberts <nroberts src gnome org>]

commit 17caccee4bcbae68a7f8b20742be54c9ac89cf75
Author: Neil Roberts <neil linux intel com>
Date:   Fri Nov 29 14:01:48 2013 +0000

    Update .gitignore
    
    (cherry picked from commit f2072ab07566461b849f60e4e347171fcc9a9877)
    
    Conflicts:
        .gitignore

 .gitignore |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 490d568..4b4e606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ depcomp
 /examples/cogl-msaa
 /examples/cogl-point-sprites
 /examples/cogl-sdl-hello
+/examples/cogl-sdl2-hello
 /examples/cogl-x11-foreign
 /examples/cogl-x11-tfp
 /examples/cogland
@@ -76,9 +77,10 @@ TAGS
 /tests/conform/test-launcher.sh
 /tests/interactive/wrapper.sh
 /tests/conform/*.bat
-/tests/conform/config.env
-/tests/micro-perf/test-journal
+/tests/conform/.log
+/tests/unit/.log
 /tests/config.env
+/tests/micro-perf/test-journal
 /po/POTFILES
 /po/*.gmo
 /po/Makefile.in.in