aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-05 08:22:26 +0200
committermarha <marha@users.sourceforge.net>2011-07-05 08:22:26 +0200
commitd5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826 (patch)
tree2814f4a3fe79e788b923978a08540eaaa1e3d75b /xorg-server/mi
parent90e0489e5a9a4bc21551ebe08043d7e1161a4228 (diff)
parent92c298bd203bf001b159752fe31ea701fbc0eae6 (diff)
downloadvcxsrv-d5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826.tar.gz
vcxsrv-d5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826.tar.bz2
vcxsrv-d5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826.zip
Merge remote-tracking branch 'origin/released'
Conflicts: pixman/Makefile.am pixman/configure.ac pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.h
Diffstat (limited to 'xorg-server/mi')
0 files changed, 0 insertions, 0 deletions