Merge branch 'release-0.3.6' into dev

Conflicts:
	CHANGELOG

Author: dmolsen

CHANGELOG

@@ -18,6 +18,10 @@ PL-v0.6.0 (in progress)
  - THX: thanks to @benedfit for the MQ idea which he originally named "phases"
  - THX: thanks to @alienlebarge for the "clean public/" idea
 
+PL-v0.3.6
+ - FIX: added a delay to the watcher so the CPU doesn't get maxed
+ - THX: thanks to martin berglund for the heads up
+
 PL-v0.3.5
  - ADD: an explicit MIT license
  - FIX: updated .gitignore so that it's more flexible

builder/builder.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.5
+ * Pattern Lab Builder CLI - v0.3.6
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

builder/lib/builder.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.3.5
+ * Pattern Lab Builder Class - v0.3.6
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

builder/lib/generator.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.3.5
+ * Pattern Lab Generator Class - v0.3.6
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

builder/lib/watcher.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.3.5
+ * Pattern Lab Watcher Class - v0.3.6
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -210,6 +210,9 @@ public function watch() {
 			unset($this->msf);
 			if (gc_enabled()) gc_collect_cycles();
 
+			// pause for .05 seconds to give the CPU a rest
+			usleep(50000);
+			
 		}
 
 	}