# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1386273645 18000
# Node ID 2217bc116aa96530e0ad145af57a6d3ee9ce2fc9
# Parent  a41042eca5a517eebd197443b38a706c170ce558# Parent  834549618a5247803e2669e20aab536177de56b1
maint: Dummy merge with gui-release, ignoring all recent backout merges

diff -r a41042eca5a5 -r 2217bc116aa9 NEWS
diff -r a41042eca5a5 -r 2217bc116aa9 build-aux/common.mk
diff -r a41042eca5a5 -r 2217bc116aa9 configure.ac
diff -r a41042eca5a5 -r 2217bc116aa9 doc/interpreter/func.txi
diff -r a41042eca5a5 -r 2217bc116aa9 doc/interpreter/grammar.txi
diff -r a41042eca5a5 -r 2217bc116aa9 doc/interpreter/var.txi
diff -r a41042eca5a5 -r 2217bc116aa9 libinterp/corefcn/toplev.cc
diff -r a41042eca5a5 -r 2217bc116aa9 libinterp/corefcn/utils.cc
diff -r a41042eca5a5 -r 2217bc116aa9 libinterp/corefcn/variables.cc
diff -r a41042eca5a5 -r 2217bc116aa9 libinterp/parse-tree/lex.ll
diff -r a41042eca5a5 -r 2217bc116aa9 libinterp/parse-tree/octave.gperf
diff -r a41042eca5a5 -r 2217bc116aa9 liboctave/array/CSparse.cc
diff -r a41042eca5a5 -r 2217bc116aa9 liboctave/array/dSparse.cc
diff -r a41042eca5a5 -r 2217bc116aa9 scripts/deprecated/module.mk
diff -r a41042eca5a5 -r 2217bc116aa9 scripts/help/help.m
diff -r a41042eca5a5 -r 2217bc116aa9 scripts/miscellaneous/what.m
diff -r a41042eca5a5 -r 2217bc116aa9 scripts/testfun/rundemos.m
diff -r a41042eca5a5 -r 2217bc116aa9 scripts/testfun/runtests.m