diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
| commit | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (patch) | |
| tree | 35a12d280fa79d40862ced37a5908a566e1bdc39 /community/collectd | |
| parent | 0a91993304168ce808fbb7eca986e03262ccb692 (diff) | |
| parent | 32793d9a5b60ef0591c71c12ad75121d9b155adf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/newsbeuter/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-ncurses/PKGBUILD
community/subtle/PKGBUILD
extra/gegl/PKGBUILD
extra/libebml/PKGBUILD
extra/libmatroska/PKGBUILD
extra/ncmpc/PKGBUILD
extra/nx/PKGBUILD
extra/qtwebkit/PKGBUILD
Diffstat (limited to 'community/collectd')
0 files changed, 0 insertions, 0 deletions