|
@@ -4,4 +4,5 @@ GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle merge=ours
|
|
|
GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
|
|
GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
|
|
|
GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
|
|
GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
|
|
|
GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
|
|
GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
|
|
|
-GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
|
|
|
|
|
|
|
+GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
|
|
|
|
|
+GameClient/Assets/Plugins merge=ours
|
