aboutsummaryrefslogtreecommitdiffstats
path: root/libs/openpgp-api-lib/res/values-zh/strings.xml
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-30 15:20:20 -0400
committerSam Whited <sam@samwhited.com>2014-10-30 15:33:13 -0400
commit46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch)
tree38ee04006e38197fd8009697b8975007ec0f45c8 /libs/openpgp-api-lib/res/values-zh/strings.xml
parent142384e5805d93887d185c9a5b74d4850e4ec719 (diff)
parenta362bd10214b16f8939c12a1dd4376667fe0d49f (diff)
Merge branch 'gradle' into development
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
Diffstat (limited to 'libs/openpgp-api-lib/res/values-zh/strings.xml')
m---------libs/openpgp-api-lib6
-rw-r--r--libs/openpgp-api-lib/res/values-zh/strings.xml2
2 files changed, 2 insertions, 6 deletions
diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib
deleted file mode 160000
-Subproject 0be263d5d3effd2df5f976fa4a127017268749c
diff --git a/libs/openpgp-api-lib/res/values-zh/strings.xml b/libs/openpgp-api-lib/res/values-zh/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-zh/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>