Merge branch 'develop'

dearplain · Mar 5, 2013 · 684148b · 684148b
2 parents 79cba1c + 8faa0e2
commit 684148b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/script/README.md b/script/README.md
@@ -0,0 +1,6 @@
+# About shadowsocks.exe
+
+Copied `goagent.exe`, modified the string table and icon using reshack.
+
+Thanks for the taskbar project created by @phuslu.
+
diff --git a/script/build.sh b/script/build.sh
@@ -24,7 +24,7 @@ build() {
     if [[ $1 == "windows" ]]; then
         mv $prog.exe $ROOT/script/
         pushd $ROOT/script/
-        zip $name.zip $prog.exe shadowsocks-tray.exe
+        zip $name.zip $prog.exe shadowsocks.exe
         rm -f $prog.exe
         mv $name.zip $bindir
         popd

diff --git a/script/shadowsocks-tray.exe → script/shadowsocks.exe b/script/shadowsocks-tray.exe → script/shadowsocks.exe