Mercurial > octave-nkf
changeset 16044:26d711ae3a37
maint: merge away extra head on default branch
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 11 Feb 2013 13:13:19 -0500 |
parents | 095d8d22c87d (current diff) 701f354b68d2 (diff) |
children | 5b9778df4ef1 |
files | |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Feb 11 11:31:45 2013 -0500 +++ b/.hgsubstate Mon Feb 11 13:13:19 2013 -0500 @@ -1,1 +1,1 @@ -fea72d94801364b1bde7cdf83237a49fe4db508a gnulib-hg +0eef0a2a05e22ac8ef2aad06dda200f7def83396 gnulib-hg
--- a/.hgtags Mon Feb 11 11:31:45 2013 -0500 +++ b/.hgtags Mon Feb 11 13:13:19 2013 -0500 @@ -72,3 +72,5 @@ df1aceb8f0bc6b5b5062907931cc663467f57d93 ss-3-7-1 858cbf6fc2ec1c232f5cf1d75dc344439b39a89c rc-3-6-4-1 faefa1bea8ddae3cab170afdeab68d3d15c4e623 ss-3-7-2 +0000000000000000000000000000000000000000 ss-3-7-2 +23a7661e529ae9bfc91693618f8c314c31f695ca ss-3-7-2