diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-01-05 21:06:31 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-01-05 21:06:31 +0100 |
| commit | 91bb789ad557ceffb3635adba7a8222a2aab2ec8 (patch) | |
| tree | 468977dc434d791e23e00c47367cd853aec1e8dc /app/editres/app-defaults/Editres | |
| parent | 1efe4cc3906c8632f2af22ff2b47ad0fe55a8e9c (diff) | |
| parent | 96de7bee3653cf7f420da623b5b449e05a4a1bd1 (diff) | |
Merge remote-tracking branch 'origin/master' into matthieu/xserver-1.13
Conflicts:
driver/xf86-video-mach64/src/atimach64exa.c
Diffstat (limited to 'app/editres/app-defaults/Editres')
0 files changed, 0 insertions, 0 deletions