changeset 20842:e429ddca0d51

maint: Periodic merge of stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 11 Dec 2015 11:40:31 -0500
parents 8f123945970e (current diff) 9851a296cf87 (diff)
children f9a0bf346ec1
files .hgtags configure.ac libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-classdef.h
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 10 12:50:06 2015 -0800
+++ b/.hgtags	Fri Dec 11 11:40:31 2015 -0500
@@ -95,3 +95,4 @@
 065f933ef08318e40b81f7fe75236e6175088117 rc-4-0-0-3
 42bb3a776c9fcc008669f382d2409297c4a901b3 rc-4-0-0-4
 3ccc2d02e64b61c6827009d42e5b12274e7ba5fc release-4-0-0
+20b17dda0e0c838646dfdccec153ec8cdf6d3c37 rc-4-0-1-1