aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-18 03:42:53 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-18 03:42:53 +0100
commit8f20c809292b8318b921e611b1ec3811f757dc11 (patch)
treefa691e324a468416c2afb1d35264e8732631ea6e
parent7f5deec050e5748b6f2dcb10726dc0f3687e69c8 (diff)
downloadsciteco-8f20c809292b8318b921e611b1ec3811f757dc11.tar.gz
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)
-rw-r--r--.gitmodules3
-rw-r--r--INSTALL4
m---------scintilla0
3 files changed, 3 insertions, 4 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
-Subproject 64e16fbc0014a9d7dd3f48337bd5e510b32a391
+Subproject 56b84945d4c6756e822c025913aaaf46099c18c