Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2013-01-09 11:07:13 +04:00
66 changed files with 630 additions and 169 deletions
@@ -25,7 +25,7 @@ public class DocutilsCommandLineState extends RestCommandLineState {
VirtualFile virtualFile = findOutput();
if (virtualFile != null) {
if (myConfiguration.openInBrowser()) {
BrowserUtil.launchBrowser(virtualFile.getUrl());
BrowserUtil.browse(virtualFile);
}
else {
FileEditorManager.getInstance(myConfiguration.getProject()).openFile(virtualFile, true);