Merge remote-tracking branch 'origin/master'

v2.2
4 changed files with 5 additions and 0 deletions
--- a/res/drawable-hdpi/falus.jpg
+++ b/res/drawable-hdpi/falus.jpg
--- a/res/drawable-hdpi/fly.jpg
+++ b/res/drawable-hdpi/fly.jpg
--- a/res/drawable-hdpi/pink.jpg
+++ b/res/drawable-hdpi/pink.jpg
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -39,6 +39,11 @@
    <string name="file_path">/MIUI/notes/</string>
    <string name="file_name_txt_format">notes_%s.txt</string>
    <!-- notes list string -->
+
+<!--    <string name="menu_fly">Background: fly</string>-->
+<!--    <string name="menu_falus">Background: falus</string>-->
+<!--    <string name="menu_pink">Background: pink</string>-->
+
    <string name="format_folder_files_count">(%d)</string>
    <string name="menu_create_folder">New Folder</string>
    <string name="menu_export_text">Export text</string>
Author	SHA1	Message	Date
陈玉爱	9c8caf1bf7	Merge remote-tracking branch 'origin/master'	3 months ago
pvbpcj2ow	4f5aeb2612	v2.2	3 months ago