Fri, 31 Aug 2012 17:06:29 +0200Closing branch to prepare for merge. javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 17:06:29 +0200] rev 237454
Closing branch to prepare for merge.

Fri, 31 Aug 2012 17:05:00 +0200synched w/ trunk javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 17:05:00 +0200] rev 237453
synched w/ trunk

Fri, 31 Aug 2012 16:53:52 +0200Automated merge with http://hg.netbeans.org/web-main
Martin Fousek <marfous@netbeans.org> [Fri, 31 Aug 2012 16:53:52 +0200] rev 237452
Automated merge with http://hg.netbeans.org/web-main

Fri, 31 Aug 2012 16:52:45 +0200Base for the Smarty braces matching
Martin Fousek <marfous@netbeans.org> [Fri, 31 Aug 2012 16:52:45 +0200] rev 237451
Base for the Smarty braces matching

Fri, 31 Aug 2012 16:53:17 +0200Changing test for now. javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 16:53:17 +0200] rev 237450
Changing test for now.

Fri, 31 Aug 2012 18:51:40 +0400Automated merge with http://hg.netbeans.org/web-main
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 31 Aug 2012 18:51:40 +0400] rev 237449
Automated merge with http://hg.netbeans.org/web-main

Fri, 31 Aug 2012 18:48:15 +0400jpql editor: inital realization to show sql for jpql for hibernate provider
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 31 Aug 2012 18:48:15 +0400] rev 237448
jpql editor: inital realization to show sql for jpql for hibernate provider

Fri, 31 Aug 2012 15:51:36 +0200Improved compatibility. Fixing failing tests. javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 15:51:36 +0200] rev 237447
Improved compatibility. Fixing failing tests.

Fri, 31 Aug 2012 10:56:15 +0200Disabling tests which are violating spec. javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 10:56:15 +0200] rev 237446
Disabling tests which are violating spec.

Fri, 31 Aug 2012 10:24:14 +0200synched w/ trunk javascript2-indenter
Petr Hejl <phejl@netbeans.org> [Fri, 31 Aug 2012 10:24:14 +0200] rev 237445
synched w/ trunk