Changeset [cb01365fc86ae0fa2f58e755719a027568d57f5f] by Jocelyn Legault
Revision cb01365fc86ae0fa2f58e755719a027568d57f5f,
committed by Jocelyn Legault
· October 12th, 2010 @ 05:34 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[UPDATE] Update Scintilla to v2.21.
Conflicts:
scintilla/cocoa/Framework.mk
scintilla/gtk/PlatGTK.cxx
scintilla/gtk/ScintillaGTK.cxx
scintilla/gtk/deps.mak
scintilla/gtk/makefile
scintilla/lexers/LexPowerPro.cxx
scintilla/macosx/ScintillaMacOSX.cxx
scintilla/macosx/ScintillaMacOSX.h
scintilla/vcbuild/SciLexer.dsp
scintilla/win32/ScintRes.rc
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/cb01365fc86ae0fa2f58e75...
29 changed files
-
M
scintilla/doc/ScintillaDoc.html -
M
scintilla/doc/ScintillaDownload.html -
M
scintilla/doc/ScintillaHistory.html -
M
scintilla/doc/index.html -
M
scintilla/include/ILexer.h -
M
scintilla/include/SciLexer.h -
M
scintilla/include/Scintilla.h -
M
scintilla/include/Scintilla.iface -
M
scintilla/include/ScintillaWidget.h -
M
scintilla/lexers/LexCPP.cxx -
M
scintilla/lexers/LexHTML.cxx -
M
scintilla/lexers/LexHaskell.cxx -
M
scintilla/lexers/LexMarkdown.cxx -
M
scintilla/lexers/LexMySQL.cxx -
M
scintilla/lexers/LexPowerPro.cxx -
M
scintilla/lexers/LexPowerShell.cxx -
M
scintilla/lexlib/LexerSimple.cxx -
M
scintilla/lexlib/StyleContext.h -
M
scintilla/src/Catalogue.cxx -
M
scintilla/src/Document.cxx -
M
scintilla/src/Document.h -
M
scintilla/src/Editor.cxx -
M
scintilla/src/LexGen.py -
M
scintilla/src/PerLine.cxx -
M
scintilla/version.txt -
M
scintilla/win32/PlatWin.cxx -
M
scintilla/win32/ScintRes.rc -
M
scintilla/win32/ScintillaWin.cxx -
M
scintilla/win32/makefile