diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
commit | db5f9e94c74935ba2d3f3e5267f5184f78303e15 (patch) | |
tree | 5ffa37eab5f2f7a1afa9f4eedc7f05636668f8de /core/wget | |
parent | 7d166e43d693278dc2585521d147f2b972e8a40c (diff) | |
parent | 223ca251f3ce07eb5484be845e631d6ca645b263 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/erlang/PKGBUILD
community/bird/PKGBUILD
community/chmsee/PKGBUILD
extra/avahi/PKGBUILD
extra/lirc/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'core/wget')
0 files changed, 0 insertions, 0 deletions