Commits | b671edd519878fcd5e6485e2d82ce35205c3c065 | iOS Team / VLionADSDKDemo

18 Oct, 2017

8 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
b671edd5
```
Conflicts:
	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
```
朱林 authored
2017-10-18 11:42:35 +0800
Browse Code »
no message
3d05d7a1

朱林 authored
2017-10-18 11:40:59 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
ce636068

张旭 authored
2017-10-18 11:40:13 +0800
Browse Code »
no message
5dcebb76

张旭 authored
2017-10-18 11:40:07 +0800
Browse Code »
占位图
ccd36aba

王军波 authored
2017-10-18 11:21:59 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
f4751dd9
```
Conflicts:
	VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
```
朱林 authored
2017-10-18 11:09:00 +0800
Browse Code »
no message
5e1f178d

朱林 authored
2017-10-18 11:08:36 +0800
Browse Code »
appiconlaunch
de2aa036

张旭 authored
2017-10-18 11:06:21 +0800
Browse Code »

17 Oct, 2017

15 commits

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

朱林 authored
2017-10-17 18:29:13 +0800
Browse Code »
no message
03eb396f

朱林 authored
2017-10-17 18:29:07 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
d1cdf28d
```
# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
```
张旭 authored
2017-10-17 18:10:40 +0800
Browse Code »
no message
30c0906f

张旭 authored
2017-10-17 18:08:35 +0800
Browse Code »
更改SDK,去掉key
e69831a7

王军波 authored
2017-10-17 17:58:38 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
e69024dc

王军波 authored
2017-10-17 17:53:17 +0800
Browse Code »
no message
211382c8

张旭 authored
2017-10-17 17:52:53 +0800
Browse Code »
启动图
8aed92d9

王军波 authored
2017-10-17 17:52:49 +0800
Browse Code »
更换SDK
3ceb1c2e

王军波 authored
2017-10-17 17:47:36 +0800
Browse Code »
no message
6d7b3b27

朱林 authored
2017-10-17 17:44:47 +0800
Browse Code »
no message
7f17ad5b

张旭 authored
2017-10-17 17:43:07 +0800
Browse Code »
真机模拟库
55a09a8d

张旭 authored
2017-10-17 16:30:41 +0800
Browse Code »
no message
1847691f

张旭 authored
2017-10-17 16:20:22 +0800
Browse Code »
工程
51ebaf5e

张旭 authored
2017-10-17 15:55:25 +0800
Browse Code »
readme
5e75796c

张旭 authored
2017-10-17 15:42:04 +0800
Browse Code »

iOS Team / VLionADSDKDemo · Commits

GitLab

18 Oct, 2017

17 Oct, 2017