[ninja-ide/ninja-ide] be0646: Fixed Issue #1886

[Diego Sarmentero]

Branch: refs/heads/master
Home: https://github.com/ninja-ide/ninja-ide
Commit: be0646a205fe0d254550c5efc8a8e178fcb8caeb
https://github.com/ninja-ide/ninja-ide/commit/be0646a205fe0d254550c5efc8a8e178fcb8caeb
Author: Gabo <acostadar...@gmail.com>
Date: 2015-02-28 (Sat, 28 Feb 2015)

Changed paths:
M ninja_ide/core/encapsulated_env/nenvironment.py

Log Message:
-----------
Fixed Issue #1886


Commit: b862e1a76d44852b01bf2cbb485874dc6e9d461f
https://github.com/ninja-ide/ninja-ide/commit/b862e1a76d44852b01bf2cbb485874dc6e9d461f
Author: Gabriel Acosta <acostadar...@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths:
M ninja_ide/core/encapsulated_env/nenvironment.py
M ninja_ide/gui/dialogs/from_import_dialog.py
M ninja_ide/gui/editor/editor.py
M ninja_ide/gui/main_panel/combo_editor.py
M ninja_ide/gui/main_panel/main_container.py
M ninja_ide/gui/main_panel/start_page.py
M ninja_ide/gui/qml/StartPage.qml

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

Conflicts:
ninja_ide/core/encapsulated_env/nenvironment.py


Commit: 2387247a8e51cc9f5f33e0c96765bfb359c9dfcd
https://github.com/ninja-ide/ninja-ide/commit/2387247a8e51cc9f5f33e0c96765bfb359c9dfcd
Author: Gabriel Acosta <acostadar...@gmail.com>
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 remote-tracking branch 'upstream/master'


Commit: 0722cecb1a0a6256a61ebedafa748a4d1d437a94
https://github.com/ninja-ide/ninja-ide/commit/0722cecb1a0a6256a61ebedafa748a4d1d437a94
Author: Gabriel Acosta <acostadar...@gmail.com>
Date: 2015-07-24 (Fri, 24 Jul 2015)

Changed paths:
M ninja_ide/translations.py

Log Message:
-----------
Fixed issue #1925


Commit: 60e813d4b361feb26e44afba7ec4866ebf56512c
https://github.com/ninja-ide/ninja-ide/commit/60e813d4b361feb26e44afba7ec4866ebf56512c
Author: Diego Sarmentero <diego.sa...@ninja-ide.org>
Date: 2015-07-25 (Sat, 25 Jul 2015)

Changed paths:
M ninja_ide/translations.py

Log Message:
-----------
Merge pull request #1926 from centaurialpha/master

Fixed issue #1925


Compare: https://github.com/ninja-ide/ninja-ide/compare/fc8fffcdb8f0...60e813d4b361