diff options
| author | Treeve Jelbert | 2014-10-02 11:23:30 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2014-10-02 11:23:30 +0200 |
| commit | 0ef9088f476a6ae0c3a6f238e9618cf22002d4a0 (patch) | |
| tree | 1fcfc61c1e5bdd84cbf21c218e05c4f0d0016e41 /xorg-data | |
| parent | 1153382643610a0379d74fb0aca0be10eabaa8ac (diff) | |
| parent | 7eea72a3d43de18515974a75af58dded177e7b6d (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
ChangeLog
gnome2-libs/pango/HISTORY
graphics-libs/libcaca/HISTORY
graphics-libs/mesalib/DETAILS
graphics-libs/mesalib/HISTORY
Diffstat (limited to 'xorg-data')
0 files changed, 0 insertions, 0 deletions