From 8f20c809292b8318b921e611b1ec3811f757dc11 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 18 Nov 2014 03:42:53 +0100 Subject: updated Scintilla submodule Scintilla is now at v3.5.1 and Scinterm at v1.4 (actually one commit after that and the sciteco-branch contains another fix for the Scinterm Makefile) --- .gitmodules | 3 +-- INSTALL | 4 ++-- scintilla | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 960755c..c4102f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,4 @@ [submodule "scintilla"] path = scintilla url = https://github.com/rhaberkorn/scintilla-mirror.git - branch = sciteco-dev - ignore = all + ignore = untracked diff --git a/INSTALL b/INSTALL index 944bc9b..c7deb29 100644 --- a/INSTALL +++ b/INSTALL @@ -32,10 +32,10 @@ These dependencies are bundled with the SciTECO Git repository and with source tar balls, so they usually do not have to be installed by the user manually: - * Scintilla (v3.4.2 to v3.4.4): + * Scintilla (v3.5.0 to v3.5.1): http://www.scintilla.org/ * When choosing the Curses interface: - * Scinterm (v1.3 or later): + * Scinterm (v1.4 or later): http://foicica.com/scinterm/ Building from Source Tar Ball or Repository diff --git a/scintilla b/scintilla index 64e16fb..56b8494 160000 --- a/scintilla +++ b/scintilla @@ -1 +1 @@ -Subproject commit 64e16fbc0014a9d7dd3f48337bd5e510b32a3918 +Subproject commit 56b84945d4c6756e822c025913aaaf46099c18c8 -- cgit v1.2.3