diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-23 16:36:50 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-23 16:36:50 +0100 |
| commit | 1938875bc4b7e7768d44d75a7ad6b0c31975ca47 (patch) | |
| tree | 8e198cd946186688ee37aad4bc52d056a20d467e /extra/bochs/PKGBUILD | |
| parent | 5bd492fb549003a5f8e22b4792a33b35e79f0531 (diff) | |
| parent | 34e6c976d28892a7bd3f7578f10fcfa57865472f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/google-gadgets/PKGBUILD
community/kvirc/PKGBUILD
community/qmc2/PKGBUILD
extra/arora/PKGBUILD
extra/dhcp/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/libreoffice/PKGBUILD
extra/monodevelop/PKGBUILD
extra/php/PKGBUILD
extra/pyqt/PKGBUILD
extra/qt/PKGBUILD
extra/qt3/PKGBUILD
extra/unixodbc/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/wine/PKGBUILD
testing/nilfs-utils/PKGBUILD
Diffstat (limited to 'extra/bochs/PKGBUILD')
0 files changed, 0 insertions, 0 deletions