mirror of https://github.com/SuperBFG7/ympd
Merge branch 'devel' of https://github.com/jcorporation/myMPD into devel
This commit is contained in:
commit
a1eaf4c1f9
4
PKGBUILD
4
PKGBUILD
|
@ -4,7 +4,11 @@
|
||||||
|
|
||||||
pkgname=mympd
|
pkgname=mympd
|
||||||
_pkgname=myMPD
|
_pkgname=myMPD
|
||||||
|
<<<<<<< HEAD
|
||||||
pkgver=4.8.0
|
pkgver=4.8.0
|
||||||
|
=======
|
||||||
|
pkgver=5.0.0
|
||||||
|
>>>>>>> cd588ab72e10ee934a8ac58f4add1dc9268ed79f
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
|
pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
|
||||||
arch=('x86_64' 'armv7h' 'aarch64')
|
arch=('x86_64' 'armv7h' 'aarch64')
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
mympd (4.8.0-1) stable; urgency=medium
|
mympd (4.8.0-1) stable; urgency=medium
|
||||||
|
|
||||||
* Release from master
|
* Release from master
|
||||||
|
|
Loading…
Reference in New Issue