| commit | a5e06180fcc26e9c56e1e9af4a8abe0d0bbfcba2 | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Wed, 30 Nov 2011 15:16:23 +0000 (30 13:16 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Wed, 30 Nov 2011 15:16:23 +0000 (30 13:16 -0200) | ||
| tree | 047953967b6291f2ab89fb1a06d57285ddacd880 | tree |
| parent | 404b616a0df20a719f011ff795cc1b9bbd35d8a4 | commitdiff |
| parent | 54a5113b6f11c73ab79ed86932c8d1e0cc732f57 | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
VLAN-GUI: include WHR-G54S port mapping
Udpxy v1.0-Chipmunk-build21
Dnsmasq 2.59 update
Fix dropbear compilation (K24 builds)
dropbear 0.54 update (cherry picked from commit 755dc74f1fdafc99953acc3f11ef52e87c7a2d0f)
* Teaman-ND:
VLAN-GUI: include WHR-G54S port mapping
Udpxy v1.0-Chipmunk-build21
Dnsmasq 2.59 update
Fix dropbear compilation (K24 builds)
dropbear 0.54 update (cherry picked from commit 755dc74f1fdafc99953acc3f11ef52e87c7a2d0f)