diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-30 17:45:13 +0100 |
commit | 704027491dc998e68dc1ac8e173bb0647ec8512e (patch) | |
tree | 4dc3df4ac72df2b10f24db64fba455ab1d643aa3 /testing/util-linux | |
parent | cd972a1ebaf9446976ea495f013947a8937c15b0 (diff) | |
parent | 51867161079ab52d5152105142a3bc965c63ca03 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/virtkey/PKGBUILD
community/yaws/PKGBUILD
core/openldap/PKGBUILD
extra/avahi/PKGBUILD
extra/gdb/PKGBUILD
Diffstat (limited to 'testing/util-linux')
0 files changed, 0 insertions, 0 deletions