aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-02-012-7/+3
|\
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-012-7/+3
| |
* | Make sure the correct bison is usedmarha2011-12-171-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-081-2/+4
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-081-2/+4
| |
* | Updated makefile with new version of freetypemarha2011-11-181-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-147-2327/+2329
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-147-2327/+2329
| | | | | | | | 14 nov 2011
* | Freetype changed version to 2.4.7 in makefilesmarha2011-11-101-2/+2
| |
* | Solved bison compilation problemmarha2011-10-271-0/+14
| |
* | Synchronised line endinge with release branchmarha2011-09-122-4516/+4516
| |
* | Updated version of freetype in makefilesmarha2011-09-051-2/+2
| |
* | freetype244 -> freetype245marha2011-07-181-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-073-2/+18
|\| | | | | | | | | | | | | | | 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 2011marha2011-07-073-2/+18
| |
* | Solved compile errors and warningsmarha2011-06-222-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-228-3526/+3545
|\| | | | | | | | | | | | | Conflicts: xkbcomp/xkbcomp.c xkbcomp/xkbcomp.h xkbcomp/xkbparse.y
| * mesa xkbcomp git update 22 June 2011marha2011-06-228-3517/+3536
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-161-4/+2
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp
| * xserver xkeyboard-config xkbcomp git update 16 June 2011marha2011-06-161-4/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-091-54/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
| * mesa xkbcomp xkeyboard-config git update 9 Jun 2011marha2011-06-091-54/+9
| |
* | svn merge ^/branches/released .marha2011-04-051-3/+6
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-745/+748
| |
* | svn merge ^/branches/released .marha2011-02-141-3768/+3768
|\|
| * xkbcomp mesa git update 14 Feb 2011marha2011-02-141-2/+2
| |
* | svn merge ^/branches/released .marha2011-02-141-62/+62
|\|
| * xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-62/+62
| |
* | svn merge ^/branches/released .marha2011-01-214-256/+256
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-214-256/+256
| |
* | svn merge ^/branches/released .marha2011-01-161-2/+2
|\|
* | svn merge ^/branches/released .marha2011-01-131-2/+2
|\|
| * mesalib pixman xkbcomp git update 13 jan 2011marha2011-01-131-2/+2
| |
* | svn merge ^/branches/released .marha2011-01-084-732/+21
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-084-732/+21
| |
* | svn merge ^/branches/released .marha2010-11-021-3/+6
|\|
| * libX11 libXdmcp xkbcomp pixman git update 2/11/2010marha2010-11-021-3/+6
| |
* | svn merge ^/branches/released .marha2010-11-013-107/+111
|\|
| * xkbcomp 1/11/2010marha2010-11-013-107/+111
| |
* | svn merge ^/branches/released .marha2010-09-272-28/+6
|\|
| * xserver xkbcomp libxcb pixman git update 24/9/2010marha2010-09-242-28/+6
| |
* | svn merge ^/branches/released .marha2010-08-201-2/+2
|\|
* | svn merge ^/branches/released .marha2010-08-181-0/+4
|\|
* | xkbcomp: avoid needless recompilation when switching between debug and releasemarha2010-08-061-4/+6
| | | | | | | | | | wrong library name for freetype library
* | Solved freetype compilation problemsmarha2010-08-061-2/+2
| |
* | svn merge ^/branches/released .marha2010-08-0527-24432/+6366
|\| | | | | | | | | Added xkeysymdb now here since it was removed from libx11. If it is removed the keyboard does not work well
| * xkbcomp git update 5/8/2010marha2010-08-0526-25645/+7581
| |
* | Added xclock and xcalc to system menu.marha2009-11-061-0/+4
| |
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-10-057-4963/+5460
|\|
| * Updated tomarha2009-10-047-723/+1220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0