summaryrefslogtreecommitdiff
path: root/community/passenger
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-18 16:54:29 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-18 16:54:29 +0200
commit6d3d853af3b9042559c2d86a7e3907f97921fb28 (patch)
treec792505884d2ffee7dee3e9060637acfe25a7021 /community/passenger
parent5880798304726de24b4c520a62a15b3090950c08 (diff)
parent2f104ecf78d6a93ba8d67273b76364cb1365a6cf (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/soprano/PKGBUILD extra/xfce4-sensors-plugin/PKGBUILD
Diffstat (limited to 'community/passenger')
0 files changed, 0 insertions, 0 deletions