Changeset [7b826e40dee2596686c7a7c6498a9cf2f48ca13d] by Jocelyn Legault
Revision 7b826e40dee2596686c7a7c6498a9cf2f48ca13d,
committed by Jocelyn Legault
· September 18th, 2010 @ 04:57 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ v5.6.3 release
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.rc
PowerEditor/src/WinControls/Preference/preference.rc
PowerEditor/src/resource.h
PowerEditor/visual.net/notepadPlus.vcproj
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7b826e40dee2596686c7a7c...
61 changed files
-
A
PowerEditor/installer/APIs/actionscript.xml -
A
PowerEditor/installer/APIs/c.xml -
A
PowerEditor/installer/APIs/cmake.xml -
A
PowerEditor/installer/APIs/cpp.xml -
A
PowerEditor/installer/APIs/cs.xml -
A
PowerEditor/installer/APIs/css.xml -
A
PowerEditor/installer/APIs/html.xml -
A
PowerEditor/installer/APIs/java.xml -
A
PowerEditor/installer/APIs/javascript.xml -
A
PowerEditor/installer/APIs/lisp.xml -
A
PowerEditor/installer/APIs/nsis.xml -
A
PowerEditor/installer/APIs/perl.xml -
A
PowerEditor/installer/APIs/php.xml -
A
PowerEditor/installer/APIs/python.xml -
A
PowerEditor/installer/APIs/rc.xml -
A
PowerEditor/installer/APIs/sql.xml -
A
PowerEditor/installer/APIs/tex.xml -
A
PowerEditor/installer/APIs/vb.xml -
A
PowerEditor/installer/APIs/vhdl.xml -
A
PowerEditor/installer/APIs/xml.xml -
A
PowerEditor/installer/themes/Bespin.xml -
A
PowerEditor/installer/themes/Black board.xml -
A
PowerEditor/installer/themes/Choco.xml -
A
PowerEditor/installer/themes/Deep Black.xml -
A
PowerEditor/installer/themes/Hello Kitty.xml -
A
PowerEditor/installer/themes/Mono Industrial.xml -
A
PowerEditor/installer/themes/Monokai.xml -
A
PowerEditor/installer/themes/Obsidian.xml -
A
PowerEditor/installer/themes/Plastic Code Wrap.xml -
A
PowerEditor/installer/themes/Ruby Blue.xml -
A
PowerEditor/installer/themes/Twilight.xml -
A
PowerEditor/installer/themes/Vibrant Ink.xml -
A
PowerEditor/installer/themes/Zenburn.xml -
A
PowerEditor/installer/themes/vim Dark Blue.xml -
R
PowerEditor/bin/themes/Bespin.xml -
R
PowerEditor/bin/themes/Black board.xml -
R
PowerEditor/bin/themes/Choco.xml -
R
PowerEditor/bin/themes/Deep Black.xml -
R
PowerEditor/bin/themes/Hello Kitty.xml -
R
PowerEditor/bin/themes/Mono Industrial.xml -
R
PowerEditor/bin/themes/Monokai.xml -
R
PowerEditor/bin/themes/Obsidian.xml -
R
PowerEditor/bin/themes/Plastic Code Wrap.xml -
R
PowerEditor/bin/themes/Ruby Blue.xml -
R
PowerEditor/bin/themes/Twilight.xml -
R
PowerEditor/bin/themes/Vibrant Ink.xml -
R
PowerEditor/bin/themes/Zenburn.xml -
R
PowerEditor/bin/themes/vim Dark Blue.xml -
M
PowerEditor/installer/nativeLang/dutch.xml -
M
PowerEditor/installer/nativeLang/english.xml -
M
PowerEditor/installer/nativeLang/finnish.xml -
M
PowerEditor/installer/nativeLang/kyrgyz.xml -
M
PowerEditor/installer/nativeLang/romanian.xml -
M
PowerEditor/installer/nativeLang/russian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/installer/packageAll.bat -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc -
M
PowerEditor/src/WinControls/Preference/preference.rc -
M
PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc -
M
PowerEditor/src/resource.h