Tue, 29 Jan 2013 09:44:25 +0100Closing branch to prepare for merge. php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Tue, 29 Jan 2013 09:44:25 +0100] rev 252444
Closing branch to prepare for merge.

Tue, 29 Jan 2013 09:42:00 +0100synched w/ trunk php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Tue, 29 Jan 2013 09:42:00 +0100] rev 252443
synched w/ trunk

Tue, 29 Jan 2013 06:32:33 +0100Automated merge with main-silver
ffjre@netbeans.org [Tue, 29 Jan 2013 06:32:33 +0100] rev 252442
Automated merge with main-silver

Mon, 28 Jan 2013 15:18:48 +0100Added support for auto-concatination of a singleline string token (when a line break is pressed inside). php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Mon, 28 Jan 2013 15:18:48 +0100] rev 252441
Added support for auto-concatination of a singleline string token (when a line break is pressed inside).

Mon, 28 Jan 2013 12:55:04 +0100Missing return statement. php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Mon, 28 Jan 2013 12:55:04 +0100] rev 252440
Missing return statement.

Preventing CME, when document has been modified (processing ARRAY tokens) and method processing was not stopped.

Mon, 28 Jan 2013 10:13:33 +0100synched w/ trunk php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Mon, 28 Jan 2013 10:13:33 +0100] rev 252439
synched w/ trunk

Thu, 24 Jan 2013 17:08:11 +0100Unused imports. php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Thu, 24 Jan 2013 17:08:11 +0100] rev 252438
Unused imports.

Thu, 24 Jan 2013 17:04:06 +0100Minor refactoring. php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Thu, 24 Jan 2013 17:04:06 +0100] rev 252437
Minor refactoring.

Thu, 24 Jan 2013 16:49:08 +0100Refactoring of PHP indenter. php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Thu, 24 Jan 2013 16:49:08 +0100] rev 252436
Refactoring of PHP indenter.

Thu, 24 Jan 2013 09:53:48 +0100synched w/ trunk php_74_features
Ondrej Brejla <obrejla@netbeans.org> [Thu, 24 Jan 2013 09:53:48 +0100] rev 252435
synched w/ trunk