diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
| commit | 0be48442ebb71571ec0ab1bbf27bf4a0759ed19b (patch) | |
| tree | 5d6384ab664e0ddbecc26676b8f56a05276cc4df /libre/python2-libre | |
| parent | e6fce62e8ff0bdb90a7e6bc3cc224bdabcd20a24 (diff) | |
| parent | ea3d877b99c32e3a9e00ab220440d4518430e5bc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/dbus-core/PKGBUILD
extra/dbus/PKGBUILD
extra/qt/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
testing/cairo/PKGBUILD
testing/cairo/git_fixes.patch
testing/glib2/PKGBUILD
testing/gtk3/PKGBUILD
testing/networkmanager/PKGBUILD
testing/python/PKGBUILD
Diffstat (limited to 'libre/python2-libre')
0 files changed, 0 insertions, 0 deletions