[ninja-ide/ninja-ide] 0ff64e: improve on branch based on pull request that wasnt...

[Diego Sarmentero]

Branch: refs/heads/master
Home: https://github.com/ninja-ide/ninja-ide
Commit: 0ff64e64bed0f1a16315ab28363381177df3b0e4
https://github.com/ninja-ide/ninja-ide/commit/0ff64e64bed0f1a16315ab28363381177df3b0e4
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths:
M ninja_ide/gui/editor/editor.py

Log Message:
-----------
improve on branch based on pull request that wasnt mergeable


Commit: c1e2c45e74b46435415186f6d7de888ede7ec9fd
https://github.com/ninja-ide/ninja-ide/commit/c1e2c45e74b46435415186f6d7de888ede7ec9fd
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths:
M ninja_ide/gui/dialogs/from_import_dialog.py
M ninja_ide/gui/editor/editor.py
M ninja_ide/gui/editor/extended_lexers/all_lexers.py
M ninja_ide/gui/main_panel/main_container.py
M ninja_ide/intellisensei/analyzer/analyzer.py

Log Message:
-----------
Merge remote-tracking branch 'upstream/master'


Commit: 5ecb41c115ca9ba6f8fdc2df61549a0fb2e4b1aa
https://github.com/ninja-ide/ninja-ide/commit/5ecb41c115ca9ba6f8fdc2df61549a0fb2e4b1aa
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2015-06-03 (Wed, 03 Jun 2015)

Changed paths:
M ninja_ide/gui/editor/highlighter.py

Log Message:
-----------
Fixed Issue #1905


Commit: fc8fffcdb8f010cbc853aee0b6238c582bbdd5da
https://github.com/ninja-ide/ninja-ide/commit/fc8fffcdb8f010cbc853aee0b6238c582bbdd5da
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2015-06-03 (Wed, 03 Jun 2015)

Changed paths:
M ninja_ide/gui/editor/editor.py
M ninja_ide/gui/editor/highlighter.py

Log Message:
-----------
Merge pull request #1921 from diegosarmentero/master

Fixed Issue #1905


Compare: https://github.com/ninja-ide/ninja-ide/compare/0dd5a824030e...fc8fffcdb8f0