diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:09:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:09:35 -0300 |
commit | af1b08b8cb081b88686b319a122aa5dbf096455f (patch) | |
tree | d896dcd1558fcc8050d3277f8dd3fef8a5c3540f /extra/java-commons-daemon | |
parent | 356d47a41ddd831fabc3969a14b6823111516ee3 (diff) | |
parent | 13759ad562d5a15571c5ffc17217c3871bbe886f (diff) |
For some reason abslibre-mips64el.git wanted to introduce regressions...
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
community/fceux/PKGBUILD
community/pcsxr/PKGBUILD
extra/lcms2/PKGBUILD
extra/pidgin/PKGBUILD
extra/sip/PKGBUILD
libre/linux-libre/PKGBUILD
social/tinc/PKGBUILD
Diffstat (limited to 'extra/java-commons-daemon')
-rw-r--r-- | extra/java-commons-daemon/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index 2f98df6db..9d804dc5f 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon pkgver=1.0.6 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://commons.apache.org/daemon/" license=('APACHE') _libname=commons-daemon |