Changeset [8cdb82f7d40b07a50f3710c2140b58967e806521] by Jocelyn Legault
Revision 8cdb82f7d40b07a50f3710c2140b58967e806521,
committed by Jocelyn Legault
· October 7th, 2010 @ 04:41 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] Update Scintilla from 2.0.1 to 2.1.2
Conflicts:
scintilla/include/Scintilla.h
scintilla/src/CallTip.h
scintilla/src/DocumentAccessor.h
scintilla/src/Editor.cxx
scintilla/src/Editor.h
scintilla/src/LexErlang.cxx
scintilla/src/ScintillaBase.h
scintilla/src/StyleContext.h
scintilla/vcbuild/SciLexer.dsp
scintilla/win32/PlatWin.cxx
scintilla/win32/ScintRes.rc
scintilla/win32/ScintillaWin.cxx
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/8cdb82f7d40b07...
103 changed files
-
M
PowerEditor/src/ScintillaComponent/Printer.h -
M
scintilla/README -
M
scintilla/doc/Design.html -
M
scintilla/doc/Icons.html -
M
scintilla/doc/SciCoding.html -
M
scintilla/doc/ScintillaDoc.html -
M
scintilla/doc/ScintillaDownload.html -
M
scintilla/doc/ScintillaHistory.html -
M
scintilla/doc/ScintillaRelated.html -
M
scintilla/doc/ScintillaToDo.html -
M
scintilla/doc/ScintillaUsage.html -
M
scintilla/doc/Steps.html -
M
scintilla/doc/index.html -
M
scintilla/gtk/Converter.h -
M
scintilla/gtk/PlatGTK.cxx -
M
scintilla/gtk/ScintillaGTK.cxx -
M
scintilla/gtk/deps.mak -
M
scintilla/gtk/makefile -
M
scintilla/include/Platform.h -
M
scintilla/include/SciLexer.h -
M
scintilla/include/Scintilla.h -
M
scintilla/include/Scintilla.iface -
M
scintilla/include/ScintillaWidget.h -
M
scintilla/include/WindowAccessor.h -
M
scintilla/src/AutoComplete.cxx -
M
scintilla/src/AutoComplete.h -
M
scintilla/src/CallTip.cxx -
M
scintilla/src/CallTip.h -
M
scintilla/src/CellBuffer.cxx -
M
scintilla/src/CellBuffer.h -
M
scintilla/src/CharacterSet.h -
M
scintilla/src/ContractionState.cxx -
M
scintilla/src/Decoration.h -
M
scintilla/src/Document.cxx -
M
scintilla/src/Document.h -
M
scintilla/src/DocumentAccessor.cxx -
M
scintilla/src/DocumentAccessor.h -
M
scintilla/src/Editor.cxx -
M
scintilla/src/Editor.h -
M
scintilla/src/ExternalLexer.cxx -
M
scintilla/src/ExternalLexer.h -
M
scintilla/src/KeyWords.cxx -
M
scintilla/src/LexAVE.cxx -
M
scintilla/src/LexBash.cxx -
M
scintilla/src/LexBullant.cxx -
M
scintilla/src/LexCOBOL.cxx -
M
scintilla/src/LexCPP.cxx -
M
scintilla/src/LexCSS.cxx -
M
scintilla/src/LexCaml.cxx -
M
scintilla/src/LexConf.cxx -
M
scintilla/src/LexCrontab.cxx -
M
scintilla/src/LexCsound.cxx -
M
scintilla/src/LexErlang.cxx -
M
scintilla/src/LexFlagship.cxx -
M
scintilla/src/LexGAP.cxx -
M
scintilla/src/LexGen.py -
M
scintilla/src/LexHTML.cxx -
M
scintilla/src/LexLisp.cxx -
M
scintilla/src/LexMMIXAL.cxx -
M
scintilla/src/LexMPT.cxx -
M
scintilla/src/LexMySQL.cxx -
M
scintilla/src/LexNsis.cxx -
M
scintilla/src/LexOpal.cxx -
M
scintilla/src/LexOthers.cxx -
M
scintilla/src/LexPerl.cxx -
M
scintilla/src/LexProgress.cxx -
M
scintilla/src/LexPython.cxx -
M
scintilla/src/LexR.cxx -
M
scintilla/src/LexSML.cxx -
M
scintilla/src/LexSQL.cxx -
M
scintilla/src/LexVB.cxx -
M
scintilla/src/LexVHDL.cxx -
M
scintilla/src/LexVerilog.cxx -
M
scintilla/src/LineMarker.cxx -
M
scintilla/src/LineMarker.h -
M
scintilla/src/PerLine.cxx -
M
scintilla/src/PositionCache.cxx -
M
scintilla/src/PositionCache.h -
M
scintilla/src/PropSet.cxx -
M
scintilla/src/RESearch.cxx -
M
scintilla/src/SVector.h -
M
scintilla/src/ScintillaBase.cxx -
M
scintilla/src/ScintillaBase.h -
M
scintilla/src/Selection.cxx -
M
scintilla/src/Selection.h -
M
scintilla/src/SplitVector.h -
M
scintilla/src/Style.cxx -
M
scintilla/src/Style.h -
M
scintilla/src/StyleContext.h -
M
scintilla/src/UniConversion.cxx -
M
scintilla/src/UniConversion.h -
M
scintilla/src/ViewStyle.cxx -
M
scintilla/src/ViewStyle.h -
M
scintilla/src/WindowAccessor.cxx -
M
scintilla/src/XPM.cxx -
M
scintilla/src/XPM.h -
M
scintilla/version.txt -
M
scintilla/win32/PlatWin.cxx -
M
scintilla/win32/ScintRes.rc -
M
scintilla/win32/ScintillaWin.cxx -
M
scintilla/win32/makefile -
M
scintilla/win32/scintilla.mak -
M
scintilla/win32/scintilla_vc6.mak