diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-13 23:42:57 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-10-13 23:42:57 -0400 |
| commit | afc1a0261985dcf8e7d73255c291098af1fdc966 (patch) | |
| tree | 5fad06062bf746b14f807e619d011cf41d83cf59 /colorpicker/src/main/res/values | |
| parent | 1edb6e1ac1297f6feb229d8f89e07a88de1ae2e9 (diff) | |
| parent | a0b35316f7bb6014ebbd3e18be870e860b30ea71 (diff) | |
| download | kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.gz kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.bz2 kau-afc1a0261985dcf8e7d73255c291098af1fdc966.zip | |
Merge dev3.4.4
Diffstat (limited to 'colorpicker/src/main/res/values')
| -rw-r--r-- | colorpicker/src/main/res/values/strings_colorpicker.xml (renamed from colorpicker/src/main/res/values/strings.xml) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/colorpicker/src/main/res/values/strings.xml b/colorpicker/src/main/res/values/strings_colorpicker.xml index 5a6f89b..5a6f89b 100644 --- a/colorpicker/src/main/res/values/strings.xml +++ b/colorpicker/src/main/res/values/strings_colorpicker.xml |