[cogl/cogl-1.18] expose deprecated fb api regardless of COGL_ENABLE_EXPERIMENTAL_2_0_API

[Robert Bragg <rbragg src gnome org>]

commit 8cedb43249ad25143c9d462d4d3fa58fe52676cb
Author: Robert Bragg <robert linux intel com>
Date:   Thu Jan 9 16:35:58 2014 +0000

    expose deprecated fb api regardless of COGL_ENABLE_EXPERIMENTAL_2_0_API
    
    test-path for example uses COGL_ENABLE_EXPERIMENTAL_2_0_API to access
    the 2.0 CoglPath api but also uses deprecated framebuffer api such as
    cogl_push/pop_framebuffer. Similarly clutter-backend.c builds with
    COGL_ENABLE_EXPERIMENTAL_2_0_API and uses cogl_set_framebuffer().
    
    Reviewed-by: Neil Roberts <neil linux intel com>

 cogl/cogl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl.h b/cogl/cogl.h
index e3ab0a0..2e27c1a 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -79,7 +79,6 @@
 #include <cogl/deprecated/cogl-fixed.h>
 #include <cogl/deprecated/cogl-material-compat.h>
 #include <cogl/deprecated/cogl-shader.h>
-#include <cogl/deprecated/cogl-framebuffer-deprecated.h>
 #include <cogl/deprecated/cogl-texture-deprecated.h>
 #endif
 
@@ -88,6 +87,7 @@
  * they enable the experimental api... */
 #include <cogl/deprecated/cogl-type-casts.h>
 
+#include <cogl/deprecated/cogl-framebuffer-deprecated.h>
 #include <cogl/deprecated/cogl-auto-texture.h>
 
 /*