diff options
author | marha <marha@users.sourceforge.net> | 2011-08-10 08:42:07 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-08-10 08:42:07 +0200 |
commit | 8e57a7fcbf736b8e437baf0bbccb93095d97617f (patch) | |
tree | ee3344cfe8cfa5ce370892e341dec494e7d95787 /libXpm/COPYING | |
parent | 4a9b92fdef532c911a0ac7d52e8ce2e77d424a18 (diff) | |
parent | fd1f4d9fe3ea67fa6def8ee4927a8f71e0440f12 (diff) | |
download | vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.tar.gz vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.tar.bz2 vcxsrv-8e57a7fcbf736b8e437baf0bbccb93095d97617f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/GL3.txt
Diffstat (limited to 'libXpm/COPYING')
0 files changed, 0 insertions, 0 deletions