Mercurial > squish / file diff

--- a/squish.lua	Tue Nov 17 14:13:38 2009 +0000
+++ b/squish.lua	Mon Jan 25 19:00:43 2010 +0000
@@ -65,7 +65,9 @@
 end
 
 function Output(fn)
-	out_fn = fn;
+	if opts.output == nil then
+		out_fn = fn;
+	end
 end
 
 function Option(name)