aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/present/present.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-11-211-9/+43
|\ | | | | | | | | * origin/released: xserver mesa git update 21 nov 2013
| * xserver mesa git update 21 nov 2013marha2013-11-211-9/+43
| | | | | | | | | | xserver commit 6403cbb143c67872ca9c58e3116ae7942def0ae1 mesa commit b7c0b61782251c1dedb0b0fb0e6654af81249910
* | Merge remote-tracking branch 'origin/released'marha2013-11-141-5/+11
|\| | | | | | | | | | | | | | | | | * origin/released: mesa xserver pixman git update 9 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/Xext/shm.c
| * mesa xserver pixman git update 9 nov 2013marha2013-11-131-5/+11
| | | | | | | | | | | | xserver commit 4a251f5883b042cd902c192060a0be2b11148f2b pixman commit 8487dfbcd056eff066939dc253fcf361b391592a mesa commit e0489531455623aa21aa565b2c890362d8437f23
* | Solved compilation and link problems after last mergemarha2013-11-081-2/+2
|/
* libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013marha2013-11-041-0/+775
xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218 libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067 mesa commit 2f896627175384fd5943f21804700a155ba4e8a0