Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/users/omega/scripts

Conflicts:
	git-compiz

1 files changed, 4 insertions, 0 deletions

diff --git a/git-compiz b/git-compiz
index 06609b0..964ba9f 100755
--- a/git-compiz
+++ b/git-compiz
@@ -436,7 +436,11 @@ else
 		printinfo info "${INFO_DOWNLOAD//%s/$b}";
 		logcmd echo
 		if (echo $1 | grep -q '%writeto%'); then
+<<<<<<< HEAD:git-compiz
 			wget -O $REALNAME -nv `echo $1 | sed 's|%writeto%.*||'`
+=======
+			wget -O `echo $1 | sed 's|.*%writeto%||'` -nv `echo $1 | sed 's|%writeto%.*||'`
+>>>>>>> 4f676be8c9509b296ba09181b6daf3aea4ed8f39:git-compiz
 		else
 			wget -nv $1
 		fi