diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
| commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
| tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /extra/multitail/PKGBUILD | |
| parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
| parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'extra/multitail/PKGBUILD')
0 files changed, 0 insertions, 0 deletions