commit dfe11c74fe59ceaa68778d80ce6a8a16227350f9 Merge: e14cf93 9539219 Author: Arturo Filastò <hellais@torproject.org> Date: Thu Aug 18 12:11:34 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/Makefile | 6 +- packages/dreamplug-uaputl/Makefile | 55 + .../dreamplug-uaputl/config/80211d_domain.conf | 28 + packages/dreamplug-uaputl/config/pack.conf | 1 + .../config/sample_cal_data_bg_8688.conf | 42 + packages/dreamplug-uaputl/config/uapcoex.conf | 21 + packages/dreamplug-uaputl/config/uaputl.conf | 95 + packages/dreamplug-uaputl/debian/README | 8 + packages/dreamplug-uaputl/debian/changelog | 5 + packages/dreamplug-uaputl/debian/compat | 1 + packages/dreamplug-uaputl/debian/control | 15 + packages/dreamplug-uaputl/debian/copyright | 28 + packages/dreamplug-uaputl/debian/dirs | 1 + packages/dreamplug-uaputl/debian/rules | 13 + packages/dreamplug-uaputl/debian/source/format | 1 + packages/dreamplug-uaputl/uapcmd.c | 4704 +++++++++++++++++ packages/dreamplug-uaputl/uapcmd.h | 63 + packages/dreamplug-uaputl/uaputl.c | 5565 ++++++++++++++++++++ packages/dreamplug-uaputl/uaputl.h | 1289 +++++ packages/torouter-web/debian/control | 4 +- packages/torouter-web/debian/rules | 2 +- packages/torouter-web/debian/torouter-tui.init | 155 + 22 files changed, 12098 insertions(+), 4 deletions(-)