projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d8a1e5 9f1ad26)
Merge remote branch 'origin/bug_314_remove_default_settings_menu_entry' into 2.8
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:42:10 +0000 (18:42 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:42:10 +0000 (18:42 +0200)
1  2 
data/menu.xml patch | diff1 | diff2 | blob | history

diff --cc data/menu.xml
index fbc5295,1b71a15..b437fbc
mode 100755,100644..100755
--- 1/data/menu.xml
--- 2/data/menu.xml
+++ b/data/menu.xml
Unnamed repository; edit this file 'description' to name the repository.