diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
| commit | f201c0c97570e91af0fcec400d827a3f1bba79cc (patch) | |
| tree | 6b87f10653f54a3b7294d3f2028704e323849781 /extra/monica | |
| parent | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (diff) | |
| parent | 947c2e7bbbd5942492024997d34d709d436f1c8f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/python/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
testing/colord/PKGBUILD
testing/epiphany/PKGBUILD
testing/fcitx/PKGBUILD
testing/folks/PKGBUILD
testing/gcalctool/PKGBUILD
testing/gcc/PKGBUILD
testing/gnome-games/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/mutter/PKGBUILD
testing/yelp/PKGBUILD
Diffstat (limited to 'extra/monica')
0 files changed, 0 insertions, 0 deletions