Merge remote-tracking branch 'origin/released'

* origin/released:
  git update 19 nov 2012
  Added bash script to update released branch

Conflicts:
	mesalib/src/mapi/glapi/gen/gl_API.xml
	mesalib/src/mesa/program/.gitignore
	pixman/pixman/pixman-mmx.c
	xorg-server/Xi/xiquerypointer.c
	xorg-server/xkb/xkb.c

1 files changed, 69 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 2d54e28cc..06cd3ce33 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -1189,6 +1189,74 @@ xkb_symbols "htcdream" {
         include "level3(alt_switch)"
 };
 
+// Workman Keyboard Layout symbols for xkb on X.Org Server 7.x
+// 09-06-2010 OJ Bucao.
+partial default alphanumeric_keys
+xkb_symbols "workman" {
+
+    include "us(basic)"
+
+    name[Group1]= "English (US, Workman)";
+
+    // Alphanumeric section
+    key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
+    key <AE01> { [            1,       exclam,      exclamdown,      onesuperior ] };
+    key <AE02> { [            2,           at,       masculine,      twosuperior ] };
+    key <AE03> { [            3,   numbersign,     ordfeminine,    threesuperior ] };
+    key <AE04> { [            4,       dollar,            cent,         sterling ] };
+    key <AE05> { [            5,      percent,        EuroSign,              yen ] };
+    key <AE06> { [            6,  asciicircum,         hstroke,          Hstroke ] };
+    key <AE07> { [            7,    ampersand,             eth,              ETH ] };
+    key <AE08> { [            8,     asterisk,           thorn,            THORN ] };
+    key <AE09> { [            9,    parenleft,  leftsinglequotemark,  leftdoublequotemark ] };
+    key <AE10> { [            0,   parenright, rightsinglequotemark,  rightdoublequotemark ] };
+    key <AE11> { [        minus,   underscore,          endash,           emdash ] };
+    key <AE12> { [        equal,         plus,        multiply,         division ] };
+
+    key <AD01> { [            q,            Q,      adiaeresis,       Adiaeresis ] };
+    key <AD02> { [            d,            D,           aring,            Aring ] };
+    key <AD03> { [            r,            R,          atilde,           Atilde ] };
+    key <AD04> { [            w,            W,          oslash,         Ooblique ] };
+    key <AD05> { [            b,            B,     dead_ogonek,       asciitilde ] };
+    key <AD06> { [            j,            J,         dstroke,          Dstroke ] };
+    key <AD07> { [            f,            F,         lstroke,          Lstroke ] };
+    key <AD08> { [            u,            U,          uacute,           Uacute ] };
+    key <AD09> { [            p,            P,      udiaeresis,       Udiaeresis ] };
+    key <AD10> { [    semicolon,        colon,      odiaeresis,       Odiaeresis ] };
+    key <AD11> { [  bracketleft,    braceleft,   guillemotleft,        0x1002039 ] };
+    key <AD12> { [ bracketright,   braceright,  guillemotright,        0x100203a ] };
+    key <BKSL> { [    backslash,          bar,      asciitilde,       asciitilde ] };
+
+    key <AC01> { [            a,            A,          aacute,           Aacute ] };
+    key <AC02> { [            s,            S,      dead_grave,       asciitilde ] }; 
+    key <AC03> { [            h,            H,          ssharp,       asciitilde ] }; 
+    key <AC04> { [            t,            T,      dead_acute, dead_doubleacute ] };
+    key <AC05> { [            g,            G,  dead_diaeresis,       asciitilde ] };
+    key <AC06> { [            y,            Y,      dead_caron,       asciitilde ] };
+    key <AC07> { [            n,            N,          ntilde,           Ntilde ] };
+    key <AC08> { [            e,            E,          eacute,           Eacute ] };
+    key <AC09> { [            o,            O,          iacute,           Iacute ] };
+    key <AC10> { [            i,            I,          oacute,           Oacute ] };
+    key <AC11> { [   apostrophe,     quotedbl,          otilde,           Otilde ] }; 
+
+    key <AB01> { [            z,            Z,              ae,               AE ] };
+    key <AB02> { [            x,            X, dead_circumflex,       asciitilde ] };
+    key <AB03> { [            m,            M,        ccedilla,         Ccedilla ] };
+    key <AB04> { [            c,            C,              oe,               OE ] };
+    key <AB05> { [            v,            V,      dead_breve,       asciitilde ] };
+    key <AB06> { [            k,            K,  dead_abovering,       asciitilde ] };
+    key <AB07> { [            l,            L,     dead_macron,       asciitilde ] };
+    key <AB08> { [        comma,         less,    dead_cedilla,       asciitilde ] };
+    key <AB09> { [       period,      greater,   dead_abovedot,       asciitilde ] };
+    key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
+
+    key <CAPS> { [    BackSpace,    Escape,       BackSpace,        BackSpace ] };
+    key <LSGT> { [        minus,   underscore,          endash,           emdash ] };
+    key <SPCE> { [        space,        space,           space,     nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
+
 // EXTRAS:
 
 // Czech, Slovak and German charecters added as third level symbols to US keyboard layout.
@@ -1383,3 +1451,4 @@ xkb_symbols "crd" {
 
   // End alphanumeric section
 };
+