vcxsrv/xorg-server/xkeyboard-config/keycodes/digital_vndr, branch release/1.15.2.x
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=release%2F1.15.2.x
2012-11-19T09:38:33+00:00
Merge remote-tracking branch 'origin/released'
2012-11-19T09:38:33+00:00
marha
marha@users.sourceforge.net
2012-11-19T09:38:33+00:00
urn:sha1:24635abae6008bef13e30d798b3f33abab412770
* 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 -> unix
2012-11-19T09:16:38+00:00
marha
marha@users.sourceforge.net
2012-11-19T09:16:38+00:00
urn:sha1:3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c
Merge remote-tracking branch 'origin/released'
2012-06-08T12:50:37+00:00
marha
marha@users.sourceforge.net
2012-06-08T12:29:46+00:00
urn:sha1:72ec0e3bb2d7fc6b77b2a75873792f781679da6a
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 files
2012-06-08T07:33:13+00:00
marha
marha@users.sourceforge.net
2012-06-08T07:33:13+00:00
urn:sha1:990bc3f015a4f8fce2eb918375defcd44980a845
svn merge ^/branches/released .
2011-02-20T14:23:37+00:00
marha
marha@users.sourceforge.net
2011-02-20T14:23:37+00:00
urn:sha1:684eb992146cad24b690073f33b909f47150b841
xserver xkeyboard-config libX11 pixman mesa git update 2011
2011-02-20T12:29:25+00:00
marha
marha@users.sourceforge.net
2011-02-20T12:29:25+00:00
urn:sha1:8a191c08ddda2e66fa26f148d6c21959bb08f923
Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch.
2010-07-13T07:48:55+00:00
marha
marha@users.sourceforge.net
2010-07-13T07:48:55+00:00
urn:sha1:d8f81c980a46279ac619312a914b563144894512
Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git repository)
2010-07-13T07:35:01+00:00
marha
marha@users.sourceforge.net
2010-07-13T07:35:01+00:00
urn:sha1:81124070f120ab658e094b64f6944d701b003a99