Merge branch 'testing' into experimental

132fc866 · p4u · f987545c · 58524028 · 132fc866 · 132fc866
Commit 132fc866 authored Sep 28, 2012 by p4u
--- a/HOWTO
+++ b/HOWTO
--- a/TODO
+++ b/TODO
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/controller/bmx6.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/controller/bmx6.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/bmx6json.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/bmx6json.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/advanced.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/hna.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/hna.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/interfaces.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/interfaces.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/main.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/plugins.lua
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/model/cbi/bmx6/plugins.lua
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/admin_status/index/neighbours_simple.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/admin_status/index/neighbours_simple.htm
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/chat.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/chat.htm
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/graph.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/graph.htm
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/links.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/links.htm
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/neighbours.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/neighbours.htm
--- a/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/neighbours_j.htm
+++ b/packages/bmx6-luci/files/usr/lib/lua/luci/view/bmx6/neighbours_j.htm
--- a/packages/bmx6-luci/files/www/cgi-bin/bmx6-info
+++ b/packages/bmx6-luci/files/www/cgi-bin/bmx6-info
--- a/packages/bmx6-qmp/Makefile
+++ b/packages/bmx6-qmp/Makefile
--- a/packages/niit/Makefile
+++ b/packages/niit/Makefile
--- a/packages/niit/src/niit.c
+++ b/packages/niit/src/niit.c
--- a/packages/niit/src/niit.h
+++ b/packages/niit/src/niit.h