diff options
| author | Remko van der Vossen | 2014-09-09 14:00:33 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2014-09-09 14:00:33 +0200 |
| commit | 37e4bf6ec8135af286a0e7e89a968e55b7ba700b (patch) | |
| tree | 3f6137cab9cf11ce7f3fe2fb1a96ef4211680ea9 /xorg-data | |
| parent | 5e35905b65250285330d2375c7756e3ffa9f749d (diff) | |
| parent | cf9d1cb8259c1898a20e6976a69aec3f11ad3bc0 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
Conflicts:
graphics/imagemagick/DETAILS
graphics/imagemagick/HISTORY
Diffstat (limited to 'xorg-data')
0 files changed, 0 insertions, 0 deletions