diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-03-16 17:26:47 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-03-16 17:26:47 +0100 |
| commit | 30201577dc8e70e308e8c09385f53a13316c08c3 (patch) | |
| tree | e7c2d588c4adc430b50e6331180845f9a5f65024 /app/xplsprinters | |
| parent | a74cc409ec3570529799496aa49a43df25fb9cad (diff) | |
| parent | 6b7eed9f16fb6559037ec54b265d8a72be991c06 (diff) | |
Merge remote-tracking branch 'origin/master' into matthieu/xserver-1.13
Conflicts:
xserver/Makefile.bsd-wrapper
Diffstat (limited to 'app/xplsprinters')
0 files changed, 0 insertions, 0 deletions