aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-121-14/+14
|
* Merge remote-tracking branch 'origin/released'marha2011-07-261-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH11.xml mesalib/src/glsl/main.cpp mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/get.c mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.h xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/man/Xquartz.man xorg-server/hw/xquartz/xpr/dri.c xorg-server/xkeyboard-config/symbols/ee
| * libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011marha2011-07-261-2/+2
| |
* | svn merge ^/branches/released .marha2011-02-251-2/+2
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-251-14/+14
|/
* xserver git update 13/9/2010marha2010-09-131-14/+14
|
* Removed files not in the git repositorymarha2010-04-281-0/+14
|
* Switched to xorg-server-1.7.99.2marha2009-12-201-14/+0
|
* Update to git master branch of xserver.marha2009-11-161-0/+14