Merge branch 'master' into bmx6_testing
Conflicts: bmx6/Makefile
This commit is contained in:
commit
e2eec4227c
1 changed files with 2 additions and 2 deletions
|
@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
|
|||
PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
|
||||
#PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
|
||||
|
||||
PKG_REV:=0a761a621b203af6c9edcd94872f91c1c60fa383
|
||||
PKG_VERSION:=r2013051001
|
||||
PKG_REV:=60adcbd4655ccf36a407bae58d66914e33f05a41
|
||||
PKG_VERSION:=r2013060803
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||
|
|
Loading…
Reference in a new issue