Skip to content

Commit 948fef3

Browse files
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/gradle.xml # .idea/misc.xml
2 parents f526aa6 + e2e88ed commit 948fef3

23 files changed

+1772
-21
lines changed

.gitignore

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1+
# Folders and files generated by Android Studio and Gradle
12
*.iml
2-
.gradle
3+
.gradle/
34
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
5+
.idea/
106
.DS_Store
11-
/build
12-
/captures
13-
.externalNativeBuild
14-
.cxx
15-
local.properties
7+
build/
8+
captures/
9+
*.apk
10+
*.aab
11+
12+
# C/C++ generated files
13+
.cxx/
14+
.externalNativeBuild/

.idea/codeStyles/Project.xml

Lines changed: 123 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deviceManager.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)