diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-20 10:57:49 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-20 10:57:49 +0200 |
commit | 742bd5a396f7a4c474e8ffec0686fc7312603cb8 (patch) | |
tree | 4279eed1d5d5c40895c7dcf0025ee62ea81144c1 /extra/poppler | |
parent | a51b3c4acfc8b2f659ad0dc6ac655b1381bef757 (diff) | |
parent | 1f9776d421ac40faa59f797893033e99e4f919eb (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gsynaptics/PKGBUILD
community/xmms2/PKGBUILD
extra/gpsd/PKGBUILD
Diffstat (limited to 'extra/poppler')
0 files changed, 0 insertions, 0 deletions