diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 00:16:25 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 00:16:25 -0300 |
| commit | 53630d2758c60da33fd47cd808a61c97a704a4e9 (patch) | |
| tree | 28b3c34b7b3955812e1455c7ed6480272cfc4af6 /extra/git | |
| parent | e749dd6e64d74f4311b672936646a3b2664cecf5 (diff) | |
| parent | cdc66cc7110e78bf1197f9effc70422114f9341b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/calibre/PKGBUILD
community/oss/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/wine/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/gthumb/PKGBUILD
testing/libgnomeui/PKGBUILD
Diffstat (limited to 'extra/git')
0 files changed, 0 insertions, 0 deletions