Merge branch 'master' of github.com:JuliaLang/julia

JuliaLang · Dec 23, 2013 · def4b95 · def4b95
2 parents 6abc0ae + d051439
commit def4b95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/contrib/README.ctags.txt b/contrib/README.ctags.txt
@@ -0,0 +1,2 @@
+The 'ctags' file is for Exuberant CTags (http://ctags.sourceforge.net/)
+Place its contents in your ~/.ctags file.
diff --git a/contrib/ctags b/contrib/ctags
@@ -1,4 +1,4 @@
 --langdef=julia
 --langmap=julia:.jl
---regex-julia='/^[ \t]*(function|macro)[ \t]+([^ \t({[]+).*$/\2/f,function/'
+--regex-julia=/^[ \t]*(function|macro|abstract|type|typealias|immutable)[ \t]+([^ \t({[]+).*$/\2/f,function/
 --regex-julia=/^[ \t]*(([^@#$ \t({[]+)|\(([^@#$ \t({[]+)\)|\((\$)\))[ \t]*(\{.*\})?[ \t]*\([^#]*\)[ \t]*=([^=].*$|$)/\2\3\4/f,function/
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -1,7 +1,7 @@
 LLVM_VER = 3.3
 LLVM_LIB_SUFFIX = 
 READLINE_VER = 6.2
-PCRE_VER = 8.31
+PCRE_VER = 8.34
 GRISU_VER = 1.1.1
 DSFMT_VER = 2.2
 ifeq ($(OS),WINNT)