Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

...

  • Loading branch information...
commit 6905ebf38f1c186e4c41a1a1e1da89e5c4320d29 1 parent 97b426d
@zzdhidden zzdhidden authored
Showing with 8 additions and 5 deletions.
  1. +1 −0  CHANGELOG
  2. +6 −4 Makefile
  3. +1 −1  TODO
View
1  CHANGELOG
@@ -1,3 +1,4 @@
+ui: 添加iframe解决flash阻挡
sound: 声音跨域支持
ui: 多themes支持,jqueryui themes
View
10 Makefile
@@ -54,14 +54,16 @@ UI_ALL_JS_FILES = ${IM}\
${UI_JS_FILES}\
UI_VER = `cat ${SRC_DIR}/version.txt`
-DATE=`svn info . | grep Date: | sed 's/.*: //g'`
-REV=`svn info . | grep Rev: | sed 's/.*: //g'`
+#DATE=`svn info . | grep Date: | sed 's/.*: //g'`
+#REV=`svn info . | grep Rev: | sed 's/.*: //g'`
+DATE=`git show . | grep Date: | sed 's/.*: //g'`
+REV=`git show . | grep Rev: | sed 's/.*: //g'`
-#REPLACE = sed 's/Date:./&'"${DATE}"'/' | \
+REPLACE = sed 's/Date:./&'"${DATE}"'/' | \
sed 's/Revision:./&'"${REV}"'/' | \
sed s/@VERSION/${UI_VER}/
-REPLACE = sed s/@VERSION/${UI_VER}/
+#REPLACE = sed s/@VERSION/${UI_VER}/
MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
UNICODE = native2ascii -encoding utf-8
View
2  TODO
@@ -1,3 +1,3 @@
i18n: 翻译English
-ui: 添加iframe解决flash阻挡
+room: room status when reconnect
Please sign in to comment.
Something went wrong with that request. Please try again.