diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 15:59:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 15:59:35 -0300 |
commit | 6fed2edc6f9533e7894bbbacdbd1dbbb50076b01 (patch) | |
tree | fae0fe13e944d0265e921e57e355718c3ccd3f10 /testing/gnome-power-manager | |
parent | 048b7287473507b76146e58378f4bfcfacf1060b (diff) | |
parent | 84837d89991e1e82e5aef8e297541c572ebf2efa (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libmcs/PKGBUILD
extra/libmowgli/PKGBUILD
kde-unstable/kdepim/PKGBUILD
Diffstat (limited to 'testing/gnome-power-manager')
0 files changed, 0 insertions, 0 deletions