Oleg Pudeyev 26fd70d9cd Merge remote-tracking branch 'upstream/develop' into ticket/11015 ... * upstream/develop: (196 commits) [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/includes/functions.php tests/cache/cache_test.php		2012-12-06 21:49:24 -05:00
..
core	Merge remote-tracking branch 'upstream/develop' into ticket/11015	2012-12-06 21:49:24 -05:00
base.php	[feature/dic] Give all cron tasks a name, change some manager usage	2012-04-09 14:34:35 +02:00
parametrized.php	[ticket/11227] @return void -> @return null, per coding guidelines.	2012-11-30 23:03:06 -05:00
task.php	[ticket/11227] @return void -> @return null, per coding guidelines.	2012-11-30 23:03:06 -05:00
wrapper.php	[feature/dic] Make cron task attributes protected, one per line	2012-08-25 16:51:19 +02:00