summaryrefslogtreecommitdiff
path: root/elementary
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-07 10:02:33 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-07 10:02:33 +0200
commitdc008569a22879a818aecc84687556c06ea07a5f (patch)
treed1f106ba2a41cbcc1ca96514a255429083862f91 /elementary
parent3ee99b867d6426de0284d34340f179a4966975a5 (diff)
parent5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/arpwatch/PKGBUILD community/partclone/PKGBUILD community/pidgin-libnotify/PKGBUILD core/systemd/PKGBUILD extra/subversion/PKGBUILD
Diffstat (limited to 'elementary')
0 files changed, 0 insertions, 0 deletions