[cogl/msvc-support: 3/5] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit cc55ea5154a3aab1b4d6775cff809663b3cc269f
Merge: bdd4883 ee01fd2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Aug 2 13:57:46 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                                 |    1 -
 cogl/{cogl-display.h.in => cogl-display.h} |    2 +-
 cogl/winsys/cogl-winsys-egl.c              |   12 +++++++-----
 configure.ac                               |    7 ++-----
 4 files changed, 10 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 66b1a18,5a17a47..145dd01
--- a/.gitignore
+++ b/.gitignore
@@@ -23,11 -23,9 +23,10 @@@ stamp-marsha
  *.gir
  *.typelib
  /cogl/cogl-defines.h
- /cogl/cogl-display.h
  /cogl/cogl-enum-types.c
  /cogl/cogl-enum-types.h
 -config.*
 +config.h
 +config.h.in
  configure
  depcomp
  /doc/reference/cogl/cogl-*.txt