Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit 37245333 by pierce
Options

Merge branch 'feature/v2.2' of… 

Merge branch 'feature/v2.2' of http://git.yabolive.net:88/iOSTeam/Majiabao/TealiveModule into feature/v2.2
parents dc38a584 90deaae7
Inline Side-by-side
Showing with 42 additions and 4 deletions
Module/GDFansGroupModule/GDFansGroupModule.xcodeproj/xcuserdata/tianminyan.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>GDFansGroupBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>40</integer>
</dict>
<key>GDFansGroupModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>68</integer>
</dict>
</dict>
</dict>
</plist>
Module/GDFightTeamModule/GDFightTeamModule.xcodeproj/xcuserdata/tianminyan.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>GDFightTeamBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>27</integer>
</dict>
<key>GDFightTeamModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>96</integer>
</dict>
</dict>
</dict>
</plist>
TealiveModule/TealiveModule.xcodeproj/project.pbxproj
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements; CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.1; MARKETING_VERSION = 2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios; PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -703,7 +703,7 @@ ...@@ -703,7 +703,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements; CODE_SIGN_ENTITLEMENTS = TealiveModule/TealiveModule.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2.1; MARKETING_VERSION = 2.2;
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios; PRODUCT_BUNDLE_IDENTIFIER = com.ft.chat.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment