Merge branch 'master' into blender-tweaks

2017-10-18 13:29:21 +02:00
parent bf8aec2a14 d36f98a15a
commit 8bc4c8c485
208 changed files with 1675 additions and 688 deletions
--- a/scripts/setup/manage_garbage.php
+++ b/scripts/setup/manage_garbage.php
@@ -5,7 +5,7 @@ $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';

 $args = new PhutilArgumentParser($argv);
-$args->setTagline(pht('manage garbage colletors'));
+$args->setTagline(pht('manage garbage collectors'));
 $args->setSynopsis(<<<EOSYNOPSIS
 **garbage** __command__ [__options__]
    Manage garbage collectors.