Merge github.com:syncthing/syncthing

Conflicts: build.go
2015-06-01 11:15:06 +02:00
parent f4daebb851 c23a601cc6
commit 3b2ecfcc45
41 changed files with 3106 additions and 2236 deletions
@@ -44,8 +44,14 @@ case "${1:-default}" in
 		go run build.go "$1"
 		;;

-	transifex)
-		go run build.go "$1"
+	prerelease)
+		go run build.go transifex
+		git add -A gui/assets/ internal/auto/
+		pushd man ; ./refresh.sh ; popd
+		git add -A man
+		echo
+		echo Changelog:
+		go run changelog.go
 		;;

 	deb)