WirelessLan/plugin.py: fix merge conflict
[enigma2.git] / lib / python / Plugins / SystemPlugins / CrashlogAutoSubmit / meta /
2009-12-23 acid-burnMerge branch 'bug_203_fix_wrong_networkstate'
2009-12-23 acid-burnMerge branch 'bug_202_networkconfig_cleanup'
2009-12-23 acid-burnMerge branch 'bug_351_softwaremanager_save_config_befor...
2009-12-23 acid-burnMerge branch 'bug_138_networkwizard_fixes'
2009-12-23 acid-burnMerge branch 'bug_204_wlan_automatic_scanning'
2009-12-23 acid-burnMerge branch 'bug_308_add_where_softwaremanager'
2009-12-23 acid-burnMerge branch 'bug_178_update_meta_files'
2009-11-25 acid-burnEnigma2-Metainformations: - update all Meta Informations
2009-09-03 ghostMerge branch 'master' of git.opendreambox.org:/git...
2009-09-03 acid-burnEnigma2-meta: install plugins-meta.xml in /usr/share...
2009-08-18 Andreas Oberritterset permissions to 644 for data files
2009-08-16 Felix Domkeenable metadata install, install into /usr/share/enigma...
2009-08-15 Andreas OberritterMakefile.am: use dist_*_DATA to include data files...
2009-08-15 Andreas Oberritterupdate all Makefile.am files
2009-07-29 FraxinasMerge branch 'master' of fraxinas@git.opendreambox...
2009-07-29 acid-burnadd CrashlogAutoSubmit Plugin for automatic crashlog...