Commits · 778ab6d676144b1675850b6bef8ef34f815bac1f · 测试练习 / GitTestMainProject

05 Dec, 2018 8 commits
- Merge branch 'master' of git@gitlab.sd-zeus.com:linyanghuan/git_test.git · 778ab6d6
  林杨欢 authored Dec 05, 2018
```
# Conflicts:
#	.gitattributes
```
  778ab6d6
- 重新测试 · 78c015f7
  林杨欢 authored Dec 05, 2018
  
  78c015f7
- 修改忽略文件 · 3a579341
  林杨欢 authored Dec 05, 2018
  
  3a579341
- 改变追踪文件到目录 · 7c7e627c
  林杨欢 authored Dec 05, 2018
  
  7c7e627c
- 测试修改大文件 · 36801649
  林杨欢 authored Dec 05, 2018
  
  36801649
- Merge branch 'master' of git@gitlab.sd-zeus.com:linyanghuan/git_test.git · 9b702df0
  林杨欢 authored Dec 05, 2018
  
  9b702df0
- 提交大文件 · 9834a8b6
  林杨欢 authored Dec 05, 2018
  
  9834a8b6
- 添加lfs · 78bbc623
  林杨欢 authored Dec 05, 2018
  
  78bbc623
23 Nov, 2018 4 commits
- 保存 · aad6647c
  林杨欢 authored Nov 23, 2018
  
  aad6647c
- 提交测试分支修改 · 119074bd
  林杨欢 authored Nov 22, 2018
  
  119074bd
- 修改参数 · cc145b58
  林杨欢 authored Nov 22, 2018
  
  cc145b58
- 修改参数 · a020ee90
  林杨欢 authored Nov 22, 2018
  
  a020ee90
22 Nov, 2018 28 commits
- 提交测试分支修改 · 7c10ba45
  林杨欢 authored Nov 22, 2018
  
  7c10ba45
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 21dd1617
  林杨欢 authored Nov 22, 2018
  
  21dd1617
- 修改参数 · 201bbf7d
  林杨欢 authored Nov 22, 2018
  
  201bbf7d
- 修改scal · 08354f06
  梁璟强 authored Nov 22, 2018
  
  08354f06
- Merge branch 'master' of git@gitlab.sd-zeus.com:linyanghuan/git_test.git · 5408d3fb
  林杨欢 authored Nov 22, 2018
  
  5408d3fb
- 修改参数 · ef3f78c5
  林杨欢 authored Nov 22, 2018
  
  ef3f78c5
- 修改位置 · fbdb8c4e
  梁璟强 authored Nov 22, 2018
  
  fbdb8c4e
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 66aad9b4
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  66aad9b4
- 保存 · d1801688
  林杨欢 authored Nov 22, 2018
  
  d1801688
- 测试移动目录 · fc4a1e8c
  梁璟强 authored Nov 22, 2018
  
  fc4a1e8c
- 添加材质到空文件夹 · 9c15e061
  梁璟强 authored Nov 22, 2018
  
  9c15e061
- 添加回meta · c5eb8ecf
  梁璟强 authored Nov 22, 2018
  
  c5eb8ecf
- 删除确实meta文件 · 02d44a87
  林杨欢 authored Nov 22, 2018
  
  02d44a87
- 间空文件夹 · 4e2d8e71
  梁璟强 authored Nov 22, 2018
  
  4e2d8e71
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · 9e19475c
  林杨欢 authored Nov 22, 2018
  
  9e19475c
- 恢复材质 · d07cff2e
  梁璟强 authored Nov 22, 2018
  
  d07cff2e
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · a3b4a98e
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  a3b4a98e
- 只改母子物体 · 076ac73f
  林杨欢 authored Nov 22, 2018
  
  076ac73f
- 只改父子物体 · 3a5cb884
  梁璟强 authored Nov 22, 2018
  
  3a5cb884
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · a8849d37
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  a8849d37
- 保留参数 · 50bb0feb
  林杨欢 authored Nov 22, 2018
  
  50bb0feb
- 修改层级 · 0942f906
  梁璟强 authored Nov 22, 2018
  
  0942f906
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · b2f34a1f
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  b2f34a1f
- 保存层级修改 · 930c5574
  梁璟强 authored Nov 22, 2018
  
  930c5574
- 保存数据修改 · b7d1079f
  林杨欢 authored Nov 22, 2018
  
  b7d1079f
- Merge branch 'master' of gitlab.sd-zeus.com:linyanghuan/git_test · dc440b6b
  林杨欢 authored Nov 22, 2018
```
# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity
```
  dc440b6b
- 保存参数修改，不保存层级 · 61e0c443
  林杨欢 authored Nov 22, 2018
  
  61e0c443
- 保存层级不保存参数修改 · 453f0d15
  梁璟强 authored Nov 22, 2018
  
  453f0d15