diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-03 11:30:08 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-03 11:30:08 +0200 |
| commit | 9f0a0bedb05193e9a3b4d6c62216667b9e6b1802 (patch) | |
| tree | c19c7439fd17e13353c7b2b781ab8c318e5231ab /community/nvdock | |
| parent | 67d0fe5c268063f831b1e727979e12211f00bbcd (diff) | |
| parent | 8cb5196780766f47b595410eed8ddbee2e8add08 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/fatrat/PKGBUILD
community-staging/pion-net/PKGBUILD
extra/xorg-server/PKGBUILD
libre/abiword-libre/PKGBUILD
staging/libreoffice/PKGBUILD
testing/bluez/PKGBUILD
testing/cairo/PKGBUILD
testing/kmod/PKGBUILD
testing/kmod/depmod-search.conf
testing/networkmanager/PKGBUILD
testing/pcmciautils/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-install-udev
Diffstat (limited to 'community/nvdock')
0 files changed, 0 insertions, 0 deletions