Merge remote-tracking branch 'origin/GeoT' into GeoT

# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
2017-01-05 10:52:09 +05:30
parent 95310c3375 0d750227f7
commit fb8a08a5cb
76 changed files with 7730 additions and 449 deletions
@@ -21,4 +21,8 @@
    <string name="menu_setting">ضبط</string>
    <string name="menu_services">خدمات</string>

+
+
+
+
 </resources>