Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-21 | 1 | -5/+36 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c | ||||
| * | fontconfig mesa git update 21 June 2011 | marha | 2011-06-21 | 1 | -5/+36 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-20 | 1 | -181/+181 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c | ||||
| * | libX11 xserver mesa git update 20 June 2011 | marha | 2011-06-20 | 1 | -181/+181 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-13 | 1 | -190/+204 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de | ||||
| * | libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵ | marha | 2011-06-13 | 1 | -190/+204 |
| | | | | | | | | update 13 Jun 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-05 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de | ||||
| * | libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011 | marha | 2011-06-05 | 2 | -2/+2 |
| | | |||||
* | | Added gitignore files | marha | 2011-05-30 | 2 | -0/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 1 | -4/+4 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 1 | -213/+213 |
| | | | | | | | | May 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-05-10 | 3 | -0/+14 |
|\| | |||||
| * | libfontenc pixman mesa git update 10 May 2011 | marha | 2011-05-10 | 3 | -0/+14 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-04 | 1 | -1/+1 |
|\| | |||||
| * | libX11 mesa glproto git update 4 May 2011 | marha | 2011-05-04 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 3 | -0/+32 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 3 | -0/+32 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 5 | -32/+58 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 5 | -1322/+1348 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 1 | -1896/+1896 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 1 | -38/+38 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 3 | -541/+532 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 3 | -86/+77 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 1 | -13/+12 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 1 | -13/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 4 | -423/+767 |
|\| | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 4 | -1643/+1987 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 6 | -631/+708 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 6 | -1156/+1233 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-17 | 4 | -184/+188 |
|\| | |||||
| * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 4 | -5072/+5076 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 10 | -2803/+2862 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 10 | -5310/+5369 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-13 | 1 | -1/+1 |
|\| | |||||
| * | xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011 | marha | 2011-03-13 | 1 | -478/+478 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-12 | 2 | -106/+111 |
|\| | |||||
| * | libX11 pixman mesa git update 12 Mar 2011 | marha | 2011-03-12 | 2 | -667/+672 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 3 | -426/+462 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 3 | -6/+42 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-05 | 5 | -412/+454 |
|\| | |||||
| * | xserver libxcb mesa git update 5 Mar 2011 | marha | 2011-03-05 | 5 | -4082/+4124 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 3 | -371/+336 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 3 | -73/+38 |
| | | |||||
* | | Solved build problem in mesa because dependency checking in VS in not ↵ | marha | 2011-03-02 | 2 | -18/+6 |
| | | | | | | | | working like expected. Now build the lex and bison files in the same script. | ||||
* | | Forgotten in previous commit | marha | 2011-03-02 | 1 | -0/+16 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 17 | -16498/+62 |
|\| | |||||
| * | xkeyboard-config mesa git update 2 Mar 2011 | marha | 2011-03-02 | 10 | -16632/+158 |
| | | |||||
| * | pixman mesa git update 1 Mar 2011 | marha | 2011-03-01 | 6 | -305/+326 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 1 | -1/+1 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 1 | -213/+213 |
| | |