Skip to content

Commit

Permalink
Merge branch 'master' into TIMOB-25556
Browse files Browse the repository at this point in the history
  • Loading branch information
garymathews authored Jul 3, 2019
2 parents df034f4 + 251754b commit ad8ffe8
Show file tree
Hide file tree
Showing 196 changed files with 1,866 additions and 8,856 deletions.
26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ node_modules/

retirejs.output.json

support/ti_mocha_script/testApp
/support/ti_mocha_script/testApp

/titanium-mobile-mocha-suite
junit.*.xml

# intelliJ Android User-specific configurations
android/.idea/libraries/
android/.idea/workspace.xml
android/.idea/tasks.xml
android/.idea/.name
android/.idea/compiler.xml
android/.idea/copyright/profiles_settings.xml
android/.idea/encodings.xml
android/.idea/misc.xml
android/.idea/modules.xml
android/.idea/scopes/scope_settings.xml
android/.idea/vcs.xml
/android/.idea/libraries/
/android/.idea/workspace.xml
/android/.idea/tasks.xml
/android/.idea/.name
/android/.idea/compiler.xml
/android/.idea/copyright/profiles_settings.xml
/android/.idea/encodings.xml
/android/.idea/misc.xml
/android/.idea/modules.xml
/android/.idea/scopes/scope_settings.xml
/android/.idea/vcs.xml
*.iml

/iphone/TitaniumKit/Carthage
Expand All @@ -42,4 +42,4 @@ android/.idea/vcs.xml
/iphone/lib/libTiCore.a

.vscode/
android/runtime/v8/src/native/V8Snapshots.h
/android/runtime/v8/src/native/V8Snapshots.h
Loading

0 comments on commit ad8ffe8

Please sign in to comment.