aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/im
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-11-193-848/+848
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Changed file permissions dos -> unix Conflicts: libX11/include/X11/Xregion.h libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/StrKeysym.c libX11/src/Window.c libX11/src/xkb/XKBBind.c libX11/src/xkb/XKBGetMap.c libX11/src/xkb/XKBSetGeom.c libX11/src/xkb/XKBUse.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libXdmcp/Key.c libXdmcp/Write.c libxcb/src/xcb_windefs.h xkbcomp/keycodes.c xkbcomp/xkbpath.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mln_s.sh xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * dos -> unixmarha2012-11-193-848/+848
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-0723-1531/+1531
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-0723-1531/+1531
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | libXmu is now a dllmarha2012-06-271-0/+2
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | Merge remote-tracking branch 'origin/released'marha2012-06-087-2555/+2555
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-087-2555/+2555
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-121-10/+42
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-121-10/+42
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-195-1014/+1002
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-195-1014/+1002
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-101-2/+5
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-101-2/+5
| |
* | Synchronised line endinge with release branchmarha2011-09-1214-13058/+13058
| |
* | Removed compile time warningsmarha2011-05-093-0/+3
| |
* | svn merge ^/branches/released .marha2011-04-278-4242/+4212
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-278-366/+336
| |
* | svn merge ^/branches/released .marha2011-04-156-784/+794
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-156-5526/+5536
| |
* | svn merge ^/branches/released .marha2011-04-131-1518/+1518
|\|
| * xkeyboard-config libxcb libX11 git update 13 April 2011marha2011-04-131-2/+2
| |
* | XKB_INSERVER is already defined in main makefilemarha2011-03-151-1/+0
| |
* | svn merge ^/branches/released .marha2011-03-121-1414/+1421
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1414/+1421
| |
* | svn merge ^/branches/released .marha2011-02-223-619/+639
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-223-126/+146
| |
* | svn merge ^/branches/released .marha2011-02-201-2/+3
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-2/+3
| |
* | svn merge ^/branches/released .marha2011-02-034-3720/+3738
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-034-3717/+3737
| |
* | svn merge ^/branches/released .marha2010-09-045-1897/+1897
|\|
| * libx11 git update 4/9/2010marha2010-09-045-1897/+1897
| |
* | svn merge ^/branches/released .marha2010-07-0810-6282/+6271
|\|
| * git update 8/7/2010marha2010-07-0810-6281/+6270
| |
* | svn merge ^/branches/released .marha2010-06-111-1/+0
|\|
| * libX11 and libXext git update 11/6/2010marha2010-06-111-1/+0
| |
* | svn merge "^/branches/released" .marha2010-05-196-5986/+4678
|\|
| * libX11 git update 19/10/2010marha2010-05-196-5986/+4678
| |
* | svn merge ^/branches/released .marha2010-01-2028-135/+200
|\|
| * Updated to:marha2010-01-1928-135/+200
| | | | | | | | | | | | libX11-1.3.3 pixman-0.17.4
* | svn merge ^/branches/releasedmarha2009-10-183-24/+30
|\|
| * Updated following packages:marha2009-10-183-24/+30
| | | | | | | | | | | | | | libX11-1.3.1 xtrans-1.2.5
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-10-052-14/+42
|\|
| * Updated tomarha2009-10-042-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | svn merge file:///D:/svnrepos/vcxsrv/branches/released .marha2009-07-2528-502/+581
|\|
| * Added libX11-1.2.2.tar.gz.marha2009-07-2528-502/+581
| |
* | Changes for VC compilationmarha2009-07-123-1/+39
|/
* Checked in the following released items:marha2009-06-2830-0/+19210
xkeyboard-config-1.4.tar.gz ttf-bitstream-vera-1.10.tar.gz font-alias-1.0.1.tar.gz font-sun-misc-1.0.0.tar.gz font-sun-misc-1.0.0.tar.gz font-sony-misc-1.0.0.tar.gz font-schumacher-misc-1.0.0.tar.gz font-mutt-misc-1.0.0.tar.gz font-misc-misc-1.0.0.tar.gz font-misc-meltho-1.0.0.tar.gz font-micro-misc-1.0.0.tar.gz font-jis-misc-1.0.0.tar.gz font-isas-misc-1.0.0.tar.gz font-dec-misc-1.0.0.tar.gz font-daewoo-misc-1.0.0.tar.gz font-cursor-misc-1.0.0.tar.gz font-arabic-misc-1.0.0.tar.gz font-winitzki-cyrillic-1.0.0.tar.gz font-misc-cyrillic-1.0.0.tar.gz font-cronyx-cyrillic-1.0.0.tar.gz font-screen-cyrillic-1.0.1.tar.gz font-xfree86-type1-1.0.1.tar.gz font-adobe-utopia-type1-1.0.1.tar.gz font-ibm-type1-1.0.0.tar.gz font-bitstream-type1-1.0.0.tar.gz font-bitstream-speedo-1.0.0.tar.gz font-bh-ttf-1.0.0.tar.gz font-bh-type1-1.0.0.tar.gz font-bitstream-100dpi-1.0.0.tar.gz font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz font-bh-100dpi-1.0.0.tar.gz font-adobe-utopia-100dpi-1.0.1.tar.gz font-adobe-100dpi-1.0.0.tar.gz font-util-1.0.1.tar.gz font-bitstream-75dpi-1.0.0.tar.gz font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz font-adobe-utopia-75dpi-1.0.1.tar.gz font-bh-75dpi-1.0.0.tar.gz bdftopcf-1.0.1.tar.gz font-adobe-75dpi-1.0.0.tar.gz mkfontscale-1.0.6.tar.gz openssl-0.9.8k.tar.gz bigreqsproto-1.0.2.tar.gz xtrans-1.2.2.tar.gz resourceproto-1.0.2.tar.gz inputproto-1.4.4.tar.gz compositeproto-0.4.tar.gz damageproto-1.1.0.tar.gz zlib-1.2.3.tar.gz xkbcomp-1.0.5.tar.gz freetype-2.3.9.tar.gz pthreads-w32-2-8-0-release.tar.gz pixman-0.12.0.tar.gz kbproto-1.0.3.tar.gz evieext-1.0.2.tar.gz fixesproto-4.0.tar.gz recordproto-1.13.2.tar.gz randrproto-1.2.2.tar.gz scrnsaverproto-1.1.0.tar.gz renderproto-0.9.3.tar.gz xcmiscproto-1.1.2.tar.gz fontsproto-2.0.2.tar.gz xextproto-7.0.3.tar.gz xproto-7.0.14.tar.gz libXdmcp-1.0.2.tar.gz libxkbfile-1.0.5.tar.gz libfontenc-1.0.4.tar.gz libXfont-1.3.4.tar.gz libX11-1.1.5.tar.gz libXau-1.0.4.tar.gz libxcb-1.1.tar.gz xorg-server-1.5.3.tar.gz