Commit 3388a46aa75e6b0e4e4639bb2114ffddf64ab993

Authored by 张旭
2 parents 7808d016 8efeddd6

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

LiveVideoCloud.xcodeproj/project.pbxproj
@@ -1123,12 +1123,12 @@ @@ -1123,12 +1123,12 @@
1123 8178D41B1F02036200AA78A4 /* Controller */ = { 1123 8178D41B1F02036200AA78A4 /* Controller */ = {
1124 isa = PBXGroup; 1124 isa = PBXGroup;
1125 children = ( 1125 children = (
1126 - 8178D41E1F02043500AA78A4 /* LVCFullScreenPlayerController.h */,  
1127 - 8178D41F1F02043500AA78A4 /* LVCFullScreenPlayerController.m */,  
1128 - 8178D4201F02043500AA78A4 /* LVCLivePlayerController.h */,  
1129 - 8178D4211F02043500AA78A4 /* LVCLivePlayerController.m */,  
1130 8178D4551F0204D600AA78A4 /* LVCTelevisioController.h */, 1126 8178D4551F0204D600AA78A4 /* LVCTelevisioController.h */,
1131 8178D4561F0204D600AA78A4 /* LVCTelevisioController.m */, 1127 8178D4561F0204D600AA78A4 /* LVCTelevisioController.m */,
  1128 + 8178D4201F02043500AA78A4 /* LVCLivePlayerController.h */,
  1129 + 8178D4211F02043500AA78A4 /* LVCLivePlayerController.m */,
  1130 + 8178D41E1F02043500AA78A4 /* LVCFullScreenPlayerController.h */,
  1131 + 8178D41F1F02043500AA78A4 /* LVCFullScreenPlayerController.m */,
1132 ); 1132 );
1133 path = Controller; 1133 path = Controller;
1134 sourceTree = "<group>"; 1134 sourceTree = "<group>";