diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-19 11:02:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-19 11:02:18 +0200 |
| commit | 4f22a5c482279b73ed0140e8962f75169f9b3e57 (patch) | |
| tree | 1369f17af7242f30a62b7ffbacd138a7978821fd /~fauno/sphinx | |
| parent | 63b47d2adad6c3c625196b2717bbd42283e9bb79 (diff) | |
| parent | 9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libgdamm/PKGBUILD
community/mingetty/PKGBUILD
extra/cups/PKGBUILD
extra/xorg-appres/PKGBUILD
extra/xorg-xrefresh/PKGBUILD
extra/xorg-xwininfo/PKGBUILD
Diffstat (limited to '~fauno/sphinx')
0 files changed, 0 insertions, 0 deletions