diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-17 12:16:22 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-17 12:16:22 +0200 |
commit | 19cc1bee6bc5b4dfe413db886b8ce66c5736d480 (patch) | |
tree | fd8d56e2700f0defda5600b21d87916dbc7e035e /libre/mc-libre | |
parent | bc864260b40f40e8f689788c54f6138007764077 (diff) | |
parent | b5f4c940227b9a7051c381688636d59f67864f93 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pidgin-libnotify/PKGBUILD
community/prelink/PKGBUILD
community/proftpd/PKGBUILD
community/xdelta3/PKGBUILD
extra/msmtp/PKGBUILD
extra/ypbind-mt/PKGBUILD
Diffstat (limited to 'libre/mc-libre')
0 files changed, 0 insertions, 0 deletions