aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-07-23 10:20:58 +0100
committerRalph Amissah <ralph@amissah.com>2007-07-23 10:20:58 +0100
commitbda262867fcdd310b9ce9fce39711e305c14e178 (patch)
tree081ffa1be7704d3b062809fca6e3996589fc609b
parentmoved vim installation back to vim/addons (diff)
parentnote on debian vim dealings (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5efedcc5..a791c3f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,7 +12,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
sisu_0.55.6-1.dsc
sisu_0.55.6-1.diff.gz
- * debian moved vim directory, installation to same locations
+ * debian vim
+ * moved vim install back to addons
+ * added recommends vim-addon-manager
%% sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 9b2b562d..c1a44ee5 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,6 +1,6 @@
"%% SiSU Vim syntax file
" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup: SiSU (sisu-0.47.6)
+" SiSU Markup: SiSU (sisu-0.55.5) (2007-07-22)
" (originally looked at Ruby Vim by Mirko Nasato)
if version < 600
syntax clear