vcxsrv/xorg-server/xkeyboard-config/rules/Makefile.am, branch 1.10.3.0 VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.0 2011-06-10T08:26:07+00:00 Merge remote-tracking branch 'origin/released' 2011-06-10T08:26:07+00:00 marha marha@users.sourceforge.net 2011-06-10T08:26:07+00:00 urn:sha1:01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xwininfo xkeyboard-config git update 10 juni 2011 2011-06-10T08:02:09+00:00 marha marha@users.sourceforge.net 2011-06-10T08:02:09+00:00 urn:sha1:ee6b5ca3b101697d067675efa68f0e603cd61ffa Merge remote-tracking branch 'origin/released' 2011-06-09T07:27:21+00:00 marha marha@users.sourceforge.net 2011-06-09T07:27:21+00:00 urn:sha1:0de14292c4fac98f91105baf9cc16e58f25d4d77 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 2011 2011-06-09T07:24:20+00:00 marha marha@users.sourceforge.net 2011-06-09T07:24:20+00:00 urn:sha1:0a9d2abef2e6fac5d52556969655a62711df6418 svn merge ^/branches/released . 2011-03-04T15:38:04+00:00 marha marha@users.sourceforge.net 2011-03-04T15:38:04+00:00 urn:sha1:3592ad31cfc72ffff3c9024eecea7d3b987c7954 xserver xkeyboard-config mesa git update 4 Marc 2011 2011-03-04T13:54:03+00:00 marha marha@users.sourceforge.net 2011-03-04T13:54:03+00:00 urn:sha1:0a5888393c68f6f7db86206d1f277232db18240b 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