# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1264446043 0
# Node ID feb7832393cdfb91f75b9871bf0588c4e2ec24f8
# Parent  90bf9ea1aaf054e463179a789eb46d51bf8a654f
Don't let squishy file override the user's specified output file, if one

diff -r 90bf9ea1aaf0 -r feb7832393cd squish.lua
--- 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)