Changeset [9c660a3df20128f351d95840f308c8fcc13aa2fb] by Jocelyn Legault
Revision 9c660a3df20128f351d95840f308c8fcc13aa2fb,
committed by Jocelyn Legault
· October 12th, 2010 @ 05:17 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] (Author: François-R Boyer) Avoid "#if 1 //" from making CppLexer crash.
[UPDATE] Update english.xml for v5.7.1 and the newest translations.
Conflicts:
PowerEditor/src/WinControls/Window.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9c660a3df20128f351d9584...
14 changed files
-
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nativeLang/Latvian.xml -
M
PowerEditor/installer/nativeLang/catalan.xml -
M
PowerEditor/installer/nativeLang/danish.xml -
M
PowerEditor/installer/nativeLang/finnish.xml -
M
PowerEditor/installer/nativeLang/italian.xml -
M
PowerEditor/installer/nativeLang/portuguese.xml -
M
PowerEditor/installer/nativeLang/romanian.xml -
M
PowerEditor/installer/nativeLang/russian.xml -
M
PowerEditor/installer/nativeLang/serbianCyrillic.xml -
M
PowerEditor/installer/nativeLang/swedish.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/WinControls/Window.h