Browse Source

Merge branch 'master' of http://106.54.229.239:3000/hello/SDK

Marvin 2 months ago
parent
commit
64265027de

+ 4 - 0
HBuilder-uniPluginDemo/Podfile.lock

@@ -158,7 +158,11 @@ SPEC CHECKSUMS:
   MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961
   MJRefresh: 2fe7fb43a5167ceda20bb7e63f130c04fd1814a5
   OpenSSL: 262f45fa54bb474ef9310f34e63dc6addb4f4b97
+<<<<<<< HEAD
   PBSDK: 695dbca4ac5502e18b2f1519d441aed3fda142f4
+=======
+  PBSDK: 647b094a817a28d9d474e71088ff0a00850d9dad
+>>>>>>> c37aca9 (改造及优化提交)
   Protobuf: ba5d83b2201386fec27d484c099cac510ea5c169
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

+ 4 - 0
HBuilder-uniPluginDemo/Pods/Manifest.lock

@@ -158,7 +158,11 @@ SPEC CHECKSUMS:
   MJExtension: 21c5f6f8c4d5d8844b7ae8fbae08fed0b501f961
   MJRefresh: 2fe7fb43a5167ceda20bb7e63f130c04fd1814a5
   OpenSSL: 262f45fa54bb474ef9310f34e63dc6addb4f4b97
+<<<<<<< HEAD
   PBSDK: 695dbca4ac5502e18b2f1519d441aed3fda142f4
+=======
+  PBSDK: 647b094a817a28d9d474e71088ff0a00850d9dad
+>>>>>>> c37aca9 (改造及优化提交)
   Protobuf: ba5d83b2201386fec27d484c099cac510ea5c169
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

File diff suppressed because it is too large
+ 421 - 0
HBuilder-uniPluginDemo/Pods/Pods.xcodeproj/project.pbxproj


Some files were not shown because too many files changed in this diff