diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-01 13:51:05 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-01 13:51:05 +0100 |
| commit | a0f694ea44b9d68390846b48d720f9a37fd679b8 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/res/values-fr | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (diff) | |
Merge pull request #600 from SamWhited/gradle
Build system and library changes (Gradle / Subtree merging)
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-fr/arrays.xml (renamed from res/values-fr/arrays.xml) | 0 | ||||
| -rw-r--r-- | src/main/res/values-fr/strings.xml (renamed from res/values-fr/strings.xml) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml index ae140796..ae140796 100644 --- a/res/values-fr/arrays.xml +++ b/src/main/res/values-fr/arrays.xml diff --git a/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index e1db316d..e1db316d 100644 --- a/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml |