Merge branch 'release-0.3.5'

dmolsen · dmolsen · commit d023ed696f97 · 2013-10-16T20:54:00.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,11 @@
 .DS_Store
-public/index.html
-public/styleguide.html
-public/styleguide/html/styleguide.html
-public/css/*
-public/fonts/*
-public/js/*
-public/images/*
-public/patterns/*
+public/*
+!public/listeners/*
+!public/styleguide/*
+!public/patterns/**/*
 config.ini
 latest-change.txt
 /public/styleguide/js/styleguide-ck.js
 /public/listeners/synclisteners-ck.js
 /public/styleguide/js/data-saver-ck.js
-/public/styleguide/js/url-handler-ck.js
+/public/styleguide/js/url-handler-ck.js
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.3.5
+ - ADD: an explicit MIT license
+ - FIX: updated .gitignore so that it's more flexible
+ - THX: thanks to @alienlebarge for the .gitignore fix
+
 PL-v0.3.4
  - FIX: Generator class renamed because it's a reserved name in PHP 5.5
  - THX: thanks to @faustgertz for the heads up
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Brad Frost, http://bradfrostweb.com & Dave Olsen, http://dmolsen.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/builder/builder.php b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.4
+ * Pattern Lab Builder CLI - v0.3.5
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/builder.lib.php b/builder/lib/builder.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.3.4
+ * Pattern Lab Builder Class - v0.3.5
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/generator.lib.php b/builder/lib/generator.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.3.4
+ * Pattern Lab Generator Class - v0.3.5
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/watcher.lib.php b/builder/lib/watcher.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.3.4
+ * Pattern Lab Watcher Class - v0.3.5
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/*!`
`4`		`- * Pattern Lab Builder CLI - v0.3.4`
	`4`	`+ * Pattern Lab Builder CLI - v0.3.5`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2013 Dave Olsen, http://dmolsen.com`
`7`	`7`	`* Licensed under the MIT license`