Browse Source

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

huangbo 8 years ago
parent
commit
1eaab35961
3 changed files with 2 additions and 4 deletions
  1. 2 1
      .gitignore
  2. BIN
      display-server/display.war
  3. 0 3
      ipu-ffmpeg/bin/jarlist.cache

+ 2 - 1
.gitignore

3
general-web-server/web/WEB-INF/classes
3
general-web-server/web/WEB-INF/classes
4
*.iml
4
*.iml
5
.idea/
5
.idea/
6
out/
6
out/
7
.project

BIN
display-server/display.war


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

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