diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-25 10:16:01 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-25 10:16:01 +0200 |
commit | 77425e418fa3a0ad0ddf41a4d3adcfe08ba9ac88 (patch) | |
tree | 95d18e80c36222043f998fe63f8f76ae21ac1dd9 /community/setconf | |
parent | 493ce1a24e001f088219cdf7b8753b00155e4051 (diff) | |
parent | 891f44722456b693d99b397f7e332a9ed68a47a2 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mpd/PKGBUILD
extra/msmtp/PKGBUILD
gnome-unstable/clutter-gtk/PKGBUILD
gnome-unstable/telepathy-gabble/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'community/setconf')
0 files changed, 0 insertions, 0 deletions