summaryrefslogtreecommitdiff
path: root/extra/xfce4-power-manager
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-04 00:20:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-04 00:20:47 -0300
commit97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (patch)
tree614d5483fcdab0aa6adecc7041c4b872ffb5a293 /extra/xfce4-power-manager
parente8eefc5a3834440246552e54c169abfa0703672e (diff)
parent8c2359e2541f9d1b11443b49d8ea502b3ffea39c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/unifdef/PKGBUILD extra/gtk2/PKGBUILD extra/libmpeg2/PKGBUILD extra/mesa/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'extra/xfce4-power-manager')
0 files changed, 0 insertions, 0 deletions