From 1c379f457633611e5edc16ed1558e67fa96a7507 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Fri, 29 Nov 2013 14:01:48 +0000
Subject: [PATCH] Update .gitignore

(cherry picked from commit f2072ab07566461b849f60e4e347171fcc9a9877)

Conflicts:
	.gitignore
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 490d568d9..243bf50e5 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
@@ -77,6 +78,8 @@ TAGS
 /tests/interactive/wrapper.sh
 /tests/conform/*.bat
 /tests/conform/config.env
+/tests/conform/.log
+/tests/unit/.log
 /tests/micro-perf/test-journal
 /tests/config.env
 /po/POTFILES