Merge branch 'gh-pages'

tkrajina · tkrajina · commit 75ee5e402b58 · 2013-05-30T07:04:37.000+02:00
Conflicts:
	makefile
diff --git a/makefile b/makefile
@@ -17,6 +17,6 @@ create-sample-images:
 upload-sample-images-to-github-pages: check-all-commited create-sample-images
 	git branch -D gh-pages
 	git checkout -b gh-pages
-	git add *.png
-	git push origin :gh-pages
+	git add -f *.png
 	git push origin gh-pages
+	git checkout master
