Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-07 | 1 | -16/+12 |
|\ | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/opt_constant_propagation.cpp mesalib/src/mesa/program/ir_to_mesa.cpp | ||||
| * | mesa xkbcomp git update 7 Juli 2011 | marha | 2011-07-07 | 1 | -16/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma | ||||
| * | xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli | marha | 2011-07-01 | 1 | -1/+3 |
| | | | | | | | | 2011 | ||||
* | | Added gitignore files | marha | 2011-05-30 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 2 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in | ||||
| * | libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011 | marha | 2011-05-29 | 2 | -1/+3 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-12 | 1 | -0/+6 |
|\| | |||||
| * | libxcb mesa xcb-proto git update 12 May 2011 | marha | 2011-05-12 | 1 | -0/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-10 | 2 | -16/+25 |
|\| | |||||
| * | libfontenc pixman mesa git update 10 May 2011 | marha | 2011-05-10 | 2 | -16/+25 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 1 | -1/+1 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 2 | -3/+3 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 2 | -3/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-02 | 3 | -7/+27 |
|\| | |||||
| * | mesa git update 1 May 2011 | marha | 2011-05-02 | 3 | -591/+611 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 1 | -455/+517 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 1 | -455/+517 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-29 | 1 | -0/+7 |
|\| | |||||
| * | xserver mesa git update 28 Apr 2011 | marha | 2011-04-29 | 1 | -1089/+1096 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -1/+5 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -1/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 8 | -369/+493 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 8 | -1105/+1229 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 3 | -255/+295 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 3 | -299/+339 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 2 | -3/+3 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 2 | -3277/+3277 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 2 | -408/+375 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 2 | -4386/+4353 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-01 | 1 | -3/+14 |
|\| | |||||
| * | libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵ | marha | 2011-04-01 | 1 | -1250/+1261 |
| | | | | | | | | Apr 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 6 | -56/+64 |
|\| | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 6 | -5602/+5610 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 1 | -20/+0 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 1 | -20/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-17 | 1 | -2/+2 |
|\| | |||||
| * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 1 | -1077/+1077 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -5/+3 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -5/+3 |
| | | |||||
* | | 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 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-12 | 4 | -5/+117 |
|\| | |||||
| * | libX11 pixman mesa git update 12 Mar 2011 | marha | 2011-03-12 | 4 | -1081/+1193 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 3 | -3/+6 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 3 | -4296/+4299 |
| | | |||||
* | | Solved build problem in mesa because dependency checking in VS in not ↵ | marha | 2011-03-02 | 2 | -16/+3 |
| | | | | | | | | working like expected. Now build the lex and bison files in the same script. | ||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 6 | -9627/+31 |
|\| | |||||
| * | xkeyboard-config mesa git update 2 Mar 2011 | marha | 2011-03-02 | 4 | -9627/+0 |
| | |