mirror_php/patternlab-php
1
0
Fork 0
mirror of https://github.com/pattern-lab/patternlab-php.git synced 2025-03-15 19:39:42 +01:00
Code Issues Releases Wiki Activity

Merge branch 'release-0.3.6' into dev

Browse Source 
Conflicts:
	CHANGELOG
This commit is contained in:
Dave Olsen 2013-11-08 09:48:45 -05:00
commit 81d5f58ad8
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -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

2
builder/builder.php
View File

@ -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

2
builder/lib/builder.lib.php
View File

@ -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

2
builder/lib/generator.lib.php
View File

@ -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

5
builder/lib/watcher.lib.php
View File

@ -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 @@ class Watchr extends Buildr {
unset($this->msf);
if (gc_enabled()) gc_collect_cycles();
// pause for .05 seconds to give the CPU a rest
usleep(50000);
}
}