Merge remote-tracking branch 'origin/3.0'

2013-10-14 15:31:54 +02:00
parent f463c4dade f50ffd614c
commit 8474a6f128
276 changed files with 2451 additions and 2043 deletions
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
@@ -119,7 +119,7 @@ private:
                           const QStringList &files);

    /**
-     * Helper method for buildFileNodeTree(): Inserts a new folder-node for
+     * Helper function for buildFileNodeTree(): Inserts a new folder-node for
     * the directory \p nodeDir and inserts it into \p nodes. If no parent
     * folder exists, it will be created recursively.
     */