Branch: refs/heads/master Home: https://github.com/geany/geany
Commit: a0367acd2dc154ed0158b0b85f1b2ebf88a3246f https://github.com/geany/geany/commit/a0367acd2dc154ed0158b0b85f1b2ebf88a324... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-10-22 (Sat, 22 Oct 2011)
Changed paths: M NEWS M data/filetypes.latex M data/filetypes.lua M data/filetypes.perl M scintilla/gtk/PlatGTK.cxx M scintilla/gtk/ScintillaGTK.cxx M scintilla/include/Platform.h M scintilla/include/SciLexer.h M scintilla/include/Scintilla.h M scintilla/include/Scintilla.iface M scintilla/lexers/LexBasic.cxx M scintilla/lexers/LexCOBOL.cxx M scintilla/lexers/LexCPP.cxx M scintilla/lexers/LexHTML.cxx M scintilla/lexers/LexLua.cxx M scintilla/lexers/LexMarkdown.cxx M scintilla/lexers/LexMatlab.cxx M scintilla/lexers/LexOthers.cxx M scintilla/lexers/LexPerl.cxx M scintilla/lexers/LexPython.cxx M scintilla/lexers/LexRuby.cxx M scintilla/lexers/LexSQL.cxx M scintilla/lexers/LexVHDL.cxx M scintilla/lexers/LexVerilog.cxx M scintilla/lexlib/Accessor.cxx M scintilla/lexlib/CharacterSet.h M scintilla/lexlib/PropSetSimple.cxx M scintilla/lexlib/SparseState.h M scintilla/lexlib/StyleContext.h M scintilla/lexlib/WordList.cxx M scintilla/scintilla_changes.patch M scintilla/src/CallTip.cxx M scintilla/src/ContractionState.cxx M scintilla/src/ContractionState.h M scintilla/src/Decoration.cxx M scintilla/src/Document.cxx M scintilla/src/Document.h M scintilla/src/Editor.cxx M scintilla/src/Editor.h M scintilla/src/Indicator.cxx M scintilla/src/Indicator.h M scintilla/src/KeyMap.cxx M scintilla/src/KeyMap.h 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/RESearch.cxx M scintilla/src/RunStyles.cxx M scintilla/src/RunStyles.h M scintilla/src/ScintillaBase.cxx M scintilla/src/Style.cxx M scintilla/src/Style.h M scintilla/src/ViewStyle.cxx M scintilla/src/ViewStyle.h M scintilla/src/XPM.cxx M scintilla/src/XPM.h M scintilla/version.txt M src/highlighting.c
Log Message: ----------- Merge branch 'scintilla-update'