diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
commit | 91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch) | |
tree | 91a5fcd8f433130db7dfc8060b66f98103949797 /~brendan | |
parent | 0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff) | |
parent | 9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts:
libre/kdelibs-libre/PKGBUILD
Diffstat (limited to '~brendan')
0 files changed, 0 insertions, 0 deletions