Merge branch 'bmx6_testing' into bmx6_testing_new_config

Conflicts:
	bmx6/Makefile

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 94aa1ed4515affc223baee3be72ee9eeb45d4761..01ff968706dbb830db9e3ee3391f0daa6d0525e7 100644 (file)
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -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:=5fbbc59b186b3af753b29125ffeb739a68de7999
-PKG_VERSION:=r2013080301
+PKG_REV:=d1464ee465b8096353773b32afba8b233f90fecf
+PKG_VERSION:=r2013080303
 PKG_RELEASE:=4
 
 PKG_SOURCE_VERSION:=$(PKG_REV)