aboutsummaryrefslogtreecommitdiff
path: root/pixman/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-012-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-012-1/+7
| |
* | svn merge ^/branches/released .marha2011-04-271-1/+1
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-48/+48
|/
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-202-34/+84
|
* pixman mesa git update 16 Feb 2011marha2011-02-1612-0/+1044