Merge remote-tracking branch 'origin/master'

代码样式
1 changed files with 4 additions and 3 deletions
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -40,9 +40,10 @@
    <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="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>
Author	SHA1	Message	Date
陈玉爱	5335c6219a	Merge remote-tracking branch 'origin/master'	3 months ago
陈玉爱	af82dd93c5	代码样式	3 months ago