diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
| commit | b84f8dfdf58409163a410c241009870ecbd35952 (patch) | |
| tree | 0ae6ab56ed3cbbc209f7ed0691a7fca52dc5d093 /~mtjm/cups-usblp/cups.logrotate | |
| parent | 6feb300093e37e58027d52ca5734624565e09598 (diff) | |
| parent | f675762300c4ee2717e029975bb3f94312245276 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrtp/PKGBUILD
community/freerdp/PKGBUILD
community/python2-pymongo/PKGBUILD
community/yaz/PKGBUILD
extra/apr/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/perl-ev/PKGBUILD
extra/poppler/PKGBUILD
extra/sqlite/PKGBUILD
extra/vim/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
testing/glib2/PKGBUILD
testing/openmpi/PKGBUILD
Diffstat (limited to '~mtjm/cups-usblp/cups.logrotate')
0 files changed, 0 insertions, 0 deletions