From 3e89a11034cd427e75122c84909fe4af8ad0981e Mon Sep 17 00:00:00 2001
From: Piedone <piedone@pyrocenter.hu>
Date: Thu, 26 Jul 2012 19:07:20 +0200
Subject: [PATCH 1/5] Updating version number

---
 Module.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Module.txt b/Module.txt
index 6e87f66..2e99a72 100644
--- a/Module.txt
+++ b/Module.txt
@@ -2,7 +2,7 @@ Name: Combinator
 AntiForgery: enabled
 Author: Piedone
 Website: http://combinator.codeplex.com
-Version: 1.3.3
+Version: 1.4
 OrchardVersion: 1.5
 Description: Combines and minifies (with YUI Compressor) external stylesheets and javascript files
 Features:

From 7a6f922e9332fba0782adb9b752261f82fd9009e Mon Sep 17 00:00:00 2001
From: Piedone <piedone@pyrocenter.hu>
Date: Thu, 26 Jul 2012 19:07:25 +0200
Subject: [PATCH 2/5] Added tag 1.4 for changeset cd983702b41e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cd2df3d..4013ec6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -21,3 +21,4 @@ e0c8da022c194cbd3c5645865797bf7ac0831177 1.1.1
 c091025843d330a99d4bd92ec06a297a45582049 1.3.1
 bdc605a70a49c5953713578081478ef68845edef 1.3.2
 321eeeafdeb9b6d8353b8c90352e0c074f9d353f 1.3.3
+cd983702b41e5f20e494f5a528c78aff108428a4 1.4

From eb97a1827aa9291f869a81afdc09caa17a769298 Mon Sep 17 00:00:00 2001
From: Piedone <piedone@pyrocenter.hu>
Date: Thu, 26 Jul 2012 19:20:30 +0200
Subject: [PATCH 3/5] Removed tag 1.4

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 4013ec6..c8a575d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,5 @@ c091025843d330a99d4bd92ec06a297a45582049 1.3.1
 bdc605a70a49c5953713578081478ef68845edef 1.3.2
 321eeeafdeb9b6d8353b8c90352e0c074f9d353f 1.3.3
 cd983702b41e5f20e494f5a528c78aff108428a4 1.4
+cd983702b41e5f20e494f5a528c78aff108428a4 1.4
+0000000000000000000000000000000000000000 1.4

From 9a235cd4d819bfabfecba26d6cff29a7204c4b26 Mon Sep 17 00:00:00 2001
From: Piedone <piedone@pyrocenter.hu>
Date: Thu, 26 Jul 2012 19:20:45 +0200
Subject: [PATCH 4/5] Adding YUI Compressor references

---
 Piedone.Combinator.csproj | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Piedone.Combinator.csproj b/Piedone.Combinator.csproj
index 7244447..9bd06d1 100644
--- a/Piedone.Combinator.csproj
+++ b/Piedone.Combinator.csproj
@@ -44,7 +44,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\Autofac.dll</HintPath>
     </Reference>
+    <Reference Include="EcmaScript.NET, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\YUICompressor\EcmaScript.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\YUICompressor\Iesi.Collections.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NAnt.Core">
+      <HintPath>Libs\YUICompressor\NAnt.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations">
@@ -66,6 +77,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libs\YUICompressor\Yahoo.Yui.Compressor.dll</HintPath>
     </Reference>
+    <Reference Include="Yahoo.Yui.Compressor.Build.MsBuild">
+      <HintPath>Libs\YUICompressor\Yahoo.Yui.Compressor.Build.MsBuild.dll</HintPath>
+    </Reference>
+    <Reference Include="Yahoo.Yui.Compressor.Build.Nant">
+      <HintPath>Libs\YUICompressor\Yahoo.Yui.Compressor.Build.Nant.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web.config" />

From fd08f2199624766ea25a8395d90f022e48bf38ee Mon Sep 17 00:00:00 2001
From: Piedone <piedone@pyrocenter.hu>
Date: Thu, 26 Jul 2012 19:20:52 +0200
Subject: [PATCH 5/5] Added tag 1.4 for changeset 2e36642bb7d3

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index c8a575d..eff809e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,5 @@ bdc605a70a49c5953713578081478ef68845edef 1.3.2
 cd983702b41e5f20e494f5a528c78aff108428a4 1.4
 cd983702b41e5f20e494f5a528c78aff108428a4 1.4
 0000000000000000000000000000000000000000 1.4
+0000000000000000000000000000000000000000 1.4
+2e36642bb7d3a5d4524ebc66b65b33ebd064be67 1.4