- Update .gitignore

- Remove dangling conflict marker in ChangeLog-ivan

.gitignore

@@ -13,16 +13,37 @@ clutter/clutter-enum-types.[ch]
 clutter/clutter-marshal.[ch]
 clutter/clutter-version.h
 clutter/stamp-*
+/clutter/clutter-json.h
+/clutter/cogl/cogl-defines-gl.h
+/clutter/cogl/cogl-defines-gles.h
+/clutter/cogl/cogl.h
 cogl-defines.h
 config.*
 configure
 depcomp
 doc/manual/clutter-manual.xml
-doc/reference/clutter-*.txt
-doc/reference/html
-doc/reference/tmpl
-doc/reference/xml
-doc/reference/version.xml
+doc/reference/clutter/clutter-*.txt
+doc/reference/clutter/html
+doc/reference/clutter/tmpl
+doc/reference/clutter/xml
+doc/reference/clutter/version.xml
+doc/reference/clutter/clutter.args
+doc/reference/clutter/clutter.hierarchy
+doc/reference/clutter/clutter.interfaces
+doc/reference/clutter/clutter.prerequisites
+doc/reference/clutter/clutter.signals
+doc/reference/clutter/*.stamp
+doc/reference/cogl/cogl-*.txt
+doc/reference/cogl/html
+doc/reference/cogl/tmpl
+doc/reference/cogl/xml
+doc/reference/cogl/version.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/*.stamp
 gtk-doc.make
 install-sh
 libtool
@@ -61,3 +82,12 @@ tests/test-timeline-rewind
 tests/test-timeline-smoothness
 tests/test-unproject
 tests/test-viewport
+/tests/test-cogl-offscreen
+/tests/test-cogl-primitives
+/tests/test-cogl-tex-convert
+/tests/test-cogl-tex-foreign
+/tests/test-cogl-tex-getset
+/tests/test-cogl-tex-polygon
+/tests/test-cogl-tex-tile
+/tests/test-pixmap
+/tests/test-stage-read-pixels

ChangeLog-ivan

@@ -182,7 +182,6 @@
 	Adds support for out of tree builds. Tested building for arm+eglx
 	glx and mingw+win32.
 
->>>>>>> .r2586
 2008-04-23  Neil Roberts  <neil@o-hand.com>
 
 	* tests/Makefile.am: Don't build test-pixmap if we are not