diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-04 10:41:31 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-04 10:41:31 +0200 |
| commit | b796bed39624486a348d1cb2881c5a1e88f84954 (patch) | |
| tree | 74f89104c89a9440733cc08bfde1c17efe2bd3db /extra/scrot | |
| parent | 589a2311981a3552f48d4c9001be0cb5a06563a9 (diff) | |
| parent | f8ac5d4703080cc87ba2fe36f68df745d3a5f62f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/kphotoalbum/PKGBUILD
community-testing/libextractor/PKGBUILD
community/mplayer2/PKGBUILD
community/preload/PKGBUILD
community/python2-pymongo/PKGBUILD
extra/virtuoso/PKGBUILD
testing/calligra/PKGBUILD
testing/hugin/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdegraphics-gwenview/PKGBUILD
testing/kdepim-runtime/PKGBUILD
testing/libkexiv2/PKGBUILD
Diffstat (limited to 'extra/scrot')
0 files changed, 0 insertions, 0 deletions