Skip to content

Commit 0da9169

Browse files
committed
Merge pull request #1137 from cocos2d/develop-temp
Changes from Risto and Donald for SBAndroid Plugin
2 parents 78142a3 + cf83ca2 commit 0da9169

40 files changed

+204
-2352
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,6 @@ api-docs
5050
installer/install.tar.gz
5151
installer/*.app
5252

53+
.idea
54+
.idea
55+
**/*/.idea

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.1
1+
3.4.2

cocos2d-tests-android/.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

cocos2d-tests-android/.idea/compiler.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

cocos2d-tests-android/.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

cocos2d-tests-android/.idea/dictionaries/phausler.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

cocos2d-tests-android/.idea/encodings.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

cocos2d-tests-android/.idea/gradle.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

cocos2d-tests-android/.idea/libraries/appcompat_v7_19_0_1.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

cocos2d-tests-android/.idea/libraries/support_v4_19_0_1.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

cocos2d-tests-android/.idea/misc.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

cocos2d-tests-android/.idea/modules.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

cocos2d-tests-android/.idea/scopes/scope_settings.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

cocos2d-tests-android/.idea/vcs.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)