Skip to content

Commit

Permalink
Merge pull request #3130 from Catrobat/release-0.9.46
Browse files Browse the repository at this point in the history
Release-0.9.46
  • Loading branch information
wslany authored Mar 5, 2019
2 parents 2487660 + 85f57b6 commit d3137c7
Show file tree
Hide file tree
Showing 833 changed files with 120,195 additions and 115,656 deletions.
13 changes: 5 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
oauth_config.xml
sed_replace.txt

google-services.json

# built application files
*.apk
*.ap_
Expand All @@ -11,19 +13,14 @@ sed_replace.txt
# workspace settings
*.metadata

#IntelliJ IDEA
# IntelliJ IDEA
.idea
*.ipr
*.iws
out
workspace.xml
tasks.xml
datasources.xml
dataSources.ids
.idea/libraries
.idea/dictionaries
!.idea/.name
!.idea/codeStyleSettings.xml
!.idea/codeStyles/Project.xml
!.idea/codeStyles/codeStyleConfig.xml
!.idea/compiler.xml
!.idea/copyright/Catroid.xml
!.idea/copyright/profiles_settings.xml
Expand Down
265 changes: 0 additions & 265 deletions .idea/codeStyleSettings.xml

This file was deleted.

Loading

0 comments on commit d3137c7

Please sign in to comment.