Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa pixman git update 18 okt 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/include/GL/glxext.h

1 files changed, 68 insertions, 68 deletions

diff --git a/include/xcb/xproto.h b/include/xcb/xproto.h
index c87fae444..ff5745b53 100644
--- a/include/xcb/xproto.h
+++ b/include/xcb/xproto.h
@@ -1010,74 +1010,74 @@ typedef enum xcb_time_t {
 typedef enum xcb_atom_enum_t {

     XCB_ATOM_NONE = 0,

     XCB_ATOM_ANY = 0,

-    XCB_ATOM_PRIMARY,

-    XCB_ATOM_SECONDARY,

-    XCB_ATOM_ARC,

-    XCB_ATOM_ATOM,

-    XCB_ATOM_BITMAP,

-    XCB_ATOM_CARDINAL,

-    XCB_ATOM_COLORMAP,

-    XCB_ATOM_CURSOR,

-    XCB_ATOM_CUT_BUFFER0,

-    XCB_ATOM_CUT_BUFFER1,

-    XCB_ATOM_CUT_BUFFER2,

-    XCB_ATOM_CUT_BUFFER3,

-    XCB_ATOM_CUT_BUFFER4,

-    XCB_ATOM_CUT_BUFFER5,

-    XCB_ATOM_CUT_BUFFER6,

-    XCB_ATOM_CUT_BUFFER7,

-    XCB_ATOM_DRAWABLE,

-    XCB_ATOM_FONT,

-    XCB_ATOM_INTEGER,

-    XCB_ATOM_PIXMAP,

-    XCB_ATOM_POINT,

-    XCB_ATOM_RECTANGLE,

-    XCB_ATOM_RESOURCE_MANAGER,

-    XCB_ATOM_RGB_COLOR_MAP,

-    XCB_ATOM_RGB_BEST_MAP,

-    XCB_ATOM_RGB_BLUE_MAP,

-    XCB_ATOM_RGB_DEFAULT_MAP,

-    XCB_ATOM_RGB_GRAY_MAP,

-    XCB_ATOM_RGB_GREEN_MAP,

-    XCB_ATOM_RGB_RED_MAP,

-    XCB_ATOM_STRING,

-    XCB_ATOM_VISUALID,

-    XCB_ATOM_WINDOW,

-    XCB_ATOM_WM_COMMAND,

-    XCB_ATOM_WM_HINTS,

-    XCB_ATOM_WM_CLIENT_MACHINE,

-    XCB_ATOM_WM_ICON_NAME,

-    XCB_ATOM_WM_ICON_SIZE,

-    XCB_ATOM_WM_NAME,

-    XCB_ATOM_WM_NORMAL_HINTS,

-    XCB_ATOM_WM_SIZE_HINTS,

-    XCB_ATOM_WM_ZOOM_HINTS,

-    XCB_ATOM_MIN_SPACE,

-    XCB_ATOM_NORM_SPACE,

-    XCB_ATOM_MAX_SPACE,

-    XCB_ATOM_END_SPACE,

-    XCB_ATOM_SUPERSCRIPT_X,

-    XCB_ATOM_SUPERSCRIPT_Y,

-    XCB_ATOM_SUBSCRIPT_X,

-    XCB_ATOM_SUBSCRIPT_Y,

-    XCB_ATOM_UNDERLINE_POSITION,

-    XCB_ATOM_UNDERLINE_THICKNESS,

-    XCB_ATOM_STRIKEOUT_ASCENT,

-    XCB_ATOM_STRIKEOUT_DESCENT,

-    XCB_ATOM_ITALIC_ANGLE,

-    XCB_ATOM_X_HEIGHT,

-    XCB_ATOM_QUAD_WIDTH,

-    XCB_ATOM_WEIGHT,

-    XCB_ATOM_POINT_SIZE,

-    XCB_ATOM_RESOLUTION,

-    XCB_ATOM_COPYRIGHT,

-    XCB_ATOM_NOTICE,

-    XCB_ATOM_FONT_NAME,

-    XCB_ATOM_FAMILY_NAME,

-    XCB_ATOM_FULL_NAME,

-    XCB_ATOM_CAP_HEIGHT,

-    XCB_ATOM_WM_CLASS,

-    XCB_ATOM_WM_TRANSIENT_FOR

+    XCB_ATOM_PRIMARY = 1,

+    XCB_ATOM_SECONDARY = 2,

+    XCB_ATOM_ARC = 3,

+    XCB_ATOM_ATOM = 4,

+    XCB_ATOM_BITMAP = 5,

+    XCB_ATOM_CARDINAL = 6,

+    XCB_ATOM_COLORMAP = 7,

+    XCB_ATOM_CURSOR = 8,

+    XCB_ATOM_CUT_BUFFER0 = 9,

+    XCB_ATOM_CUT_BUFFER1 = 10,

+    XCB_ATOM_CUT_BUFFER2 = 11,

+    XCB_ATOM_CUT_BUFFER3 = 12,

+    XCB_ATOM_CUT_BUFFER4 = 13,

+    XCB_ATOM_CUT_BUFFER5 = 14,

+    XCB_ATOM_CUT_BUFFER6 = 15,

+    XCB_ATOM_CUT_BUFFER7 = 16,

+    XCB_ATOM_DRAWABLE = 17,

+    XCB_ATOM_FONT = 18,

+    XCB_ATOM_INTEGER = 19,

+    XCB_ATOM_PIXMAP = 20,

+    XCB_ATOM_POINT = 21,

+    XCB_ATOM_RECTANGLE = 22,

+    XCB_ATOM_RESOURCE_MANAGER = 23,

+    XCB_ATOM_RGB_COLOR_MAP = 24,

+    XCB_ATOM_RGB_BEST_MAP = 25,

+    XCB_ATOM_RGB_BLUE_MAP = 26,

+    XCB_ATOM_RGB_DEFAULT_MAP = 27,

+    XCB_ATOM_RGB_GRAY_MAP = 28,

+    XCB_ATOM_RGB_GREEN_MAP = 29,

+    XCB_ATOM_RGB_RED_MAP = 30,

+    XCB_ATOM_STRING = 31,

+    XCB_ATOM_VISUALID = 32,

+    XCB_ATOM_WINDOW = 33,

+    XCB_ATOM_WM_COMMAND = 34,

+    XCB_ATOM_WM_HINTS = 35,

+    XCB_ATOM_WM_CLIENT_MACHINE = 36,

+    XCB_ATOM_WM_ICON_NAME = 37,

+    XCB_ATOM_WM_ICON_SIZE = 38,

+    XCB_ATOM_WM_NAME = 39,

+    XCB_ATOM_WM_NORMAL_HINTS = 40,

+    XCB_ATOM_WM_SIZE_HINTS = 41,

+    XCB_ATOM_WM_ZOOM_HINTS = 42,

+    XCB_ATOM_MIN_SPACE = 43,

+    XCB_ATOM_NORM_SPACE = 44,

+    XCB_ATOM_MAX_SPACE = 45,

+    XCB_ATOM_END_SPACE = 46,

+    XCB_ATOM_SUPERSCRIPT_X = 47,

+    XCB_ATOM_SUPERSCRIPT_Y = 48,

+    XCB_ATOM_SUBSCRIPT_X = 49,

+    XCB_ATOM_SUBSCRIPT_Y = 50,

+    XCB_ATOM_UNDERLINE_POSITION = 51,

+    XCB_ATOM_UNDERLINE_THICKNESS = 52,

+    XCB_ATOM_STRIKEOUT_ASCENT = 53,

+    XCB_ATOM_STRIKEOUT_DESCENT = 54,

+    XCB_ATOM_ITALIC_ANGLE = 55,

+    XCB_ATOM_X_HEIGHT = 56,

+    XCB_ATOM_QUAD_WIDTH = 57,

+    XCB_ATOM_WEIGHT = 58,

+    XCB_ATOM_POINT_SIZE = 59,

+    XCB_ATOM_RESOLUTION = 60,

+    XCB_ATOM_COPYRIGHT = 61,

+    XCB_ATOM_NOTICE = 62,

+    XCB_ATOM_FONT_NAME = 63,

+    XCB_ATOM_FAMILY_NAME = 64,

+    XCB_ATOM_FULL_NAME = 65,

+    XCB_ATOM_CAP_HEIGHT = 66,

+    XCB_ATOM_WM_CLASS = 67,

+    XCB_ATOM_WM_TRANSIENT_FOR = 68

 } xcb_atom_enum_t;

 

 /** Opcode for xcb_selection_request. */