Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn · npp-community/npp-community@1fe13f5 · GitHub

Commit

Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

Browse files

[UPDATE] refactor Notepad_plus.cpp.

Conflicts:
	PowerEditor/src/Notepad_plus.cpp
	PowerEditor/src/NppLocalization.cpp
	PowerEditor/visual.net/notepadPlus.vcproj

[#45]

Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>

Loading branch information

joce committed Sep 30, 2010

2 parents e71013e + b5019c6 commit 1fe13f5