diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 00:47:11 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 00:47:11 +0200 |
| commit | c39cbc60bd9cca21cdb7f174725bcd1f866e95d9 (patch) | |
| tree | e1ab5429c30dcac4e282e1fba53182f0ea509d75 /core/shadow | |
| parent | 70dd19e62605010a1403e8e28a9d40ca5b09409a (diff) | |
| parent | 5520a8b04cecf4af812cbf2285e9ab6efabe147f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libgringotts/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/steghide/PKGBUILD
community/twin/PKGBUILD
core/bzip2/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
testing/samba/PKGBUILD
testing/xfsprogs/PKGBUILD
Diffstat (limited to 'core/shadow')
0 files changed, 0 insertions, 0 deletions