diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
| commit | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (patch) | |
| tree | 906904bdff9c33a3f9ded24ba8c89488469c5d94 /libXpm/cxpm/Makefile.am | |
| parent | 821b51e814fe14d35f3807c525e4387022b9ed80 (diff) | |
| parent | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff) | |
| download | vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.gz vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.bz2 vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xserver pixman mesa git update 20 sep 2012
Conflicts:
libxcb/src/xcb_conn.c
Diffstat (limited to 'libXpm/cxpm/Makefile.am')
0 files changed, 0 insertions, 0 deletions