浏览代码

Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share.git

huangbo 8 年之前
父节点
当前提交
1eaab35961
共有 3 个文件被更改,包括 2 次插入4 次删除
  1. 2 1
      .gitignore
  2. 二进制
      display-server/display.war
  3. 0 3
      ipu-ffmpeg/bin/jarlist.cache

+ 2 - 1
.gitignore

@ -3,4 +3,5 @@ wade-mobile-push-yunba
3 3
general-web-server/web/WEB-INF/classes
4 4
*.iml
5 5
.idea/
6
out/
6
out/
7
.project

二进制
display-server/display.war


+ 0 - 3
ipu-ffmpeg/bin/jarlist.cache

@ -1,3 +0,0 @@
1
# cache for current jar dependency. DO NOT EDIT.
2
# format is <lastModified> <length> <SHA-1> <path>
3
# Encoding is UTF-8