summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-05-25 13:05:10 +0100
committerRobert Bragg <robert@linux.intel.com>2012-08-06 14:27:44 +0100
commite58b21017ece64d87c4d2380d58e45876d214c65 (patch)
tree33c53bfc7262f2f753ab12b916c877336aa20456 /.gitignore
parent5c16ad65c530dc39beec7ae22b0070d6bf77da4c (diff)
downloadcogl-e58b21017ece64d87c4d2380d58e45876d214c65.tar.gz
Update .gitignore
The usual suspects (more examples ans tests, generated headers) and the documentation updated to the cogl2 name. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 90b07230692d3fb36ea18c651ae120e472b5380e)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore45
1 files changed, 19 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index da020a72..f00897ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,11 @@ stamp-marshal
/cogl-pango/cogl-pango.rc
/cogl/cogl.rc
/cogl/cogl-defines.h
+/cogl/cogl-defines.h.win32
+/cogl/cogl-defines.h.win32_SDL
/cogl/cogl-enum-types.c
/cogl/cogl-enum-types.h
+/cogl/cogl-gl-header.h
config.h
config.h.in
config.h.win32
@@ -38,36 +41,25 @@ config.log
config.status
configure
depcomp
-/doc/reference/cogl/cogl-*.txt
-!/doc/reference/cogl/cogl-sections.txt
-/doc/reference/cogl/html
-/doc/reference/cogl/tmpl
-/doc/reference/cogl/xml
-/doc/reference/cogl/cogl.args
-/doc/reference/cogl/cogl.hierarchy
-/doc/reference/cogl/cogl.interfaces
-/doc/reference/cogl/cogl.prerequisites
-/doc/reference/cogl/cogl.signals
-/doc/reference/cogl/cogl-docs.xml
-/doc/reference/cogl/*.stamp
-/doc/reference/cogl/*.bak
-/doc/reference/cogl-2.0-experimental/cogl-*.txt
-!/doc/reference/cogl-2.0-experimental/cogl-sections.txt
-/doc/reference/cogl-2.0-experimental/html
-/doc/reference/cogl-2.0-experimental/tmpl
-/doc/reference/cogl-2.0-experimental/xml
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.args
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.hierarchy
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.interfaces
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.prerequisites
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental.signals
-/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml
-/doc/reference/cogl-2.0-experimental/*.stamp
-/doc/reference/cogl-2.0-experimental/*.bak
+/doc/reference/cogl2/cogl2-*.txt
+!/doc/reference/cogl2/cogl2-sections.txt
+/doc/reference/cogl2/html
+/doc/reference/cogl2/tmpl
+/doc/reference/cogl2/xml
+/doc/reference/cogl2/cogl2.args
+/doc/reference/cogl2/cogl2.hierarchy
+/doc/reference/cogl2/cogl2.interfaces
+/doc/reference/cogl2/cogl2.prerequisites
+/doc/reference/cogl2/cogl2.signals
+/doc/reference/cogl2/cogl2-docs.xml
+/doc/reference/cogl2/*.stamp
+/doc/reference/cogl2/*.bak
/examples/cogl-crate
+/examples/cogl-gles2-context
/examples/cogl-hello
/examples/cogl-info
/examples/cogl-msaa
+/examples/cogl-sdl-hello
/examples/cogl-x11-foreign
/examples/cogl-x11-tfp
/examples/cogland
@@ -84,6 +76,7 @@ TAGS
/tests/interactive/wrapper.sh
/tests/conform/*.bat
/tests/conform/config.env
+/tests/micro-perf/test-journal
/po/POTFILES
/po/*.gmo
/po/Makefile.in.in