summaryrefslogtreecommitdiff
path: root/~brendan
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-21 13:12:20 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-21 13:12:20 -0300
commit2b8e2cf7956063f583b5ad2425930115761bb7ae (patch)
treea50efdc4cf99312b80c95718e8693b7e41b034c3 /~brendan
parent19d0c098d66c67860d212786491f5285014a9e09 (diff)
parent7bcc3e9d12b9294024067ecaf8ab28a9fe83ab6c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/midori/PKGBUILD extra/libffado/PKGBUILD gnome-unstable/eog/PKGBUILD gnome-unstable/gnome-settings-daemon/PKGBUILD testing/util-linux/PKGBUILD
Diffstat (limited to '~brendan')
0 files changed, 0 insertions, 0 deletions