diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-22 12:03:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-22 12:03:57 -0300 |
| commit | 0830ec32f40473e1a83ec7e12be11daabf6d2762 (patch) | |
| tree | d2929aa2fd3c63af741f9862575025734f785aba /community/embryo-svn/PKGBUILD | |
| parent | c02976460621a16b172e3e33432d5790f3ed6117 (diff) | |
| parent | b7f839da11975b9f2a964a82d591b7a8628f0931 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pppd-ldap/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/totem/PKGBUILD
Diffstat (limited to 'community/embryo-svn/PKGBUILD')
0 files changed, 0 insertions, 0 deletions