summaryrefslogtreecommitdiff
path: root/social
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-01-10 17:54:45 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-01-10 17:54:45 -0300
commit201e906ce628e92e00276f89534317ac5496e956 (patch)
tree3f112195cc332fd523622e75b3f13a94548a63f8 /social
parent0e2a2f452ec5849dcdfefd7a8817640a572b98a8 (diff)
parentdae24b9bff18ea229c727ad885e845c9de0b42a3 (diff)
downloadabslibre-201e906ce628e92e00276f89534317ac5496e956.tar.gz
abslibre-201e906ce628e92e00276f89534317ac5496e956.tar.bz2
abslibre-201e906ce628e92e00276f89534317ac5496e956.zip
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts: cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
Diffstat (limited to 'social')
0 files changed, 0 insertions, 0 deletions