diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:15:51 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:15:51 +0100 |
| commit | 786a5a906d13ec5832fbecf5c4fa5421f2cac790 (patch) | |
| tree | dad699d93fac8d8d0476f522a8d0d6b2035e2504 /lib/python/Components/ParentalControlList.py | |
| parent | 44985357544c5a3bf67a758c8612102ac59a74cc (diff) | |
| parent | 075c89b1e624ce80fa02aa789a319d84cbe928b4 (diff) | |
| download | enigma2-786a5a906d13ec5832fbecf5c4fa5421f2cac790.tar.gz enigma2-786a5a906d13ec5832fbecf5c4fa5421f2cac790.zip | |
Merge branch 'bug_203_fix_wrong_networkstate'
Conflicts:
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/NetworkSetup.py
Diffstat (limited to 'lib/python/Components/ParentalControlList.py')
0 files changed, 0 insertions, 0 deletions