diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-21 11:26:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-21 11:26:12 -0300 |
| commit | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (patch) | |
| tree | 8e4f525a74e1ec4d373256b380f7d49305ed5d00 /extra/pm-utils | |
| parent | a05bf04c686ff44fc6c12fbe774d65032b74c55d (diff) | |
| parent | 11484c032f8c236b2044e715a9a3b28e33f65598 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/6tunnel/PKGBUILD
community/chrootuid/PKGBUILD
community/cpulimit/PKGBUILD
community/cutter/PKGBUILD
community/darkhttpd/PKGBUILD
community/darkstat/PKGBUILD
community/datemath/PKGBUILD
community/delegate/PKGBUILD
community/dfm/PKGBUILD
community/freedroid/PKGBUILD
community/parano/PKGBUILD
community/pyvorbis/PKGBUILD
community/scrotwm/PKGBUILD
extra/antlr2/PKGBUILD
extra/live-media/PKGBUILD
extra/mono-zeroconf/PKGBUILD
extra/vlc/PKGBUILD
Diffstat (limited to 'extra/pm-utils')
0 files changed, 0 insertions, 0 deletions