changeset 15905:d2774d202323

maint: merge stable to default
author John W. Eaton <jwe@octave.org>
date Sat, 05 Jan 2013 19:58:22 -0500
parents 927b121ad63f (current diff) 7c469bffc599 (diff)
children 53ec9063dc6d
files .hgsubstate .hgtags configure.ac libinterp/Makefile.am libinterp/gendoc.pl src/Makefile.am
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Sat Jan 05 21:30:01 2013 +0100
+++ b/.hgsubstate	Sat Jan 05 19:58:22 2013 -0500
@@ -1,1 +1,1 @@
-c960be36c9f3f690ceb43057314354e0df736416 gnulib-hg
+e2f98cc246bdb12f2d35366042d4aab61c3d54fe gnulib-hg
--- a/.hgtags	Sat Jan 05 21:30:01 2013 +0100
+++ b/.hgtags	Sat Jan 05 19:58:22 2013 -0500
@@ -70,3 +70,4 @@
 a95432e7309ca6fc776c02939264bb6d443f3525 release-3-6-3
 2e8eb9ac43a5f8cfaf0423814a312ed47cb80485 rc-3-6-4-0
 df1aceb8f0bc6b5b5062907931cc663467f57d93 ss-3-7-1
+858cbf6fc2ec1c232f5cf1d75dc344439b39a89c rc-3-6-4-1