diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
| commit | 564593462ea4dd96fbe4842469b7a0da920a13f2 (patch) | |
| tree | 18b2e3b9ece473535048dc17c7282662427e6108 /extra/xorg-xfs | |
| parent | 81cc989543d935f11be84b3fb0696a57c2d9abd2 (diff) | |
| parent | 905dec08e7144fe77aad1161778a6c3b74ff305c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
extra/scim/PKGBUILD
extra/vim/PKGBUILD
testing/cogl/PKGBUILD
testing/kmod/PKGBUILD
testing/rhythmbox/PKGBUILD
Diffstat (limited to 'extra/xorg-xfs')
0 files changed, 0 insertions, 0 deletions