This is the mail archive of the
libstdc++-cvs@gcc.gnu.org
mailing list for the libstdc++ project.
r114644 - in /branches/sched-treegion-branch: ....
- From: mcrosier at gcc dot gnu dot org
- To: libstdc++-cvs at gcc dot gnu dot org
- Date: Wed, 14 Jun 2006 15:56:03 -0000
- Subject: r114644 - in /branches/sched-treegion-branch: ....
Author: mcrosier
Date: Wed Jun 14 15:56:02 2006
New Revision: 114644
URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=114644
Log:
* Merged revisions 114518-114643 via svnmerge from
svn+ssh://mcrosier@gcc.gnu.org/svn/gcc/trunk
Added:
branches/sched-treegion-branch/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/random_device/
- copied from r114643, trunk/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/random_device/
Removed:
branches/sched-treegion-branch/libstdc++-v3/src/locale-misc-inst.cc
Modified:
branches/sched-treegion-branch/libstdc++-v3/ChangeLog
branches/sched-treegion-branch/libstdc++-v3/acinclude.m4
branches/sched-treegion-branch/libstdc++-v3/config.h.in
branches/sched-treegion-branch/libstdc++-v3/config/locale/generic/c_locale.h
branches/sched-treegion-branch/libstdc++-v3/config/locale/gnu/c_locale.h
branches/sched-treegion-branch/libstdc++-v3/configure
branches/sched-treegion-branch/libstdc++-v3/configure.ac
branches/sched-treegion-branch/libstdc++-v3/include/bits/locale_facets.tcc
branches/sched-treegion-branch/libstdc++-v3/include/tr1/random
branches/sched-treegion-branch/libstdc++-v3/src/Makefile.am
branches/sched-treegion-branch/libstdc++-v3/src/Makefile.in
branches/sched-treegion-branch/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/mersenne_twister/cons/gen1.cc
Changes in other areas also in this revision:
Added:
branches/sched-treegion-branch/gcc/testsuite/g++.dg/cpp/_Pragma1.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/cpp/_Pragma1.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/eh/div.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/eh/div.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/gomp/macro-3.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/gomp/macro-3.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/gomp/macro-4.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/gomp/macro-4.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/init/complex1.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/init/complex1.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/lookup/using15.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/lookup/using15.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/other/anon4.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/other/anon4.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/parse/ctor6.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/parse/ctor6.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/parse/defarg11.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/parse/defarg11.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/template/friend42.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/template/friend42.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/template/spec30.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/template/spec30.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/tree-ssa/pr26757.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/tree-ssa/pr26757.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/tree-ssa/pr27830.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/tree-ssa/pr27830.C
branches/sched-treegion-branch/gcc/testsuite/g++.dg/tree-ssa/pr27894.C
- copied unchanged from r114643, trunk/gcc/testsuite/g++.dg/tree-ssa/pr27894.C
branches/sched-treegion-branch/gcc/testsuite/gcc.c-torture/compile/20060609-1.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.c-torture/compile/20060609-1.c
branches/sched-treegion-branch/gcc/testsuite/gcc.c-torture/compile/pr27863.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.c-torture/compile/pr27863.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/cpp/_Pragma6.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/cpp/_Pragma6.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/gomp/macro-3.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/gomp/macro-3.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/gomp/macro-4.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/gomp/macro-4.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/pr27959.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/pr27959.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/vla-7.c
- copied unchanged from r114643, trunk/gcc/testsuite/gcc.dg/vla-7.c
branches/sched-treegion-branch/gcc/testsuite/gfortran.dg/entry_6.f90
- copied unchanged from r114643, trunk/gcc/testsuite/gfortran.dg/entry_6.f90
branches/sched-treegion-branch/gcc/testsuite/gfortran.dg/entry_7.f90
- copied unchanged from r114643, trunk/gcc/testsuite/gfortran.dg/entry_7.f90
branches/sched-treegion-branch/libgomp/testsuite/libgomp.fortran/pr27916-1.f90
- copied unchanged from r114643, trunk/libgomp/testsuite/libgomp.fortran/pr27916-1.f90
branches/sched-treegion-branch/libgomp/testsuite/libgomp.fortran/pr27916-2.f90
- copied unchanged from r114643, trunk/libgomp/testsuite/libgomp.fortran/pr27916-2.f90
branches/sched-treegion-branch/libjava/classpath/gnu/java/net/IndexListParser.java
- copied unchanged from r114643, trunk/libjava/classpath/gnu/java/net/IndexListParser.java
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/appletviewer/
- copied from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/appletviewer/
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/getopt/
- copied from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/getopt/
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/jar/
- copied from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/jar/
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties
- copied unchanged from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/keytool/messages.properties
- copied unchanged from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/keytool/messages.properties
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/native2ascii/
- copied from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/native2ascii/
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/serialver/
- copied from r114643, trunk/libjava/classpath/resource/gnu/classpath/tools/serialver/
Removed:
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gtkcairopeer.h
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties
branches/sched-treegion-branch/libjava/classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties
Modified:
branches/sched-treegion-branch/ (props changed)
branches/sched-treegion-branch/ChangeLog
branches/sched-treegion-branch/config-ml.in
branches/sched-treegion-branch/config/ChangeLog
branches/sched-treegion-branch/config/gettext-sister.m4
branches/sched-treegion-branch/configure
branches/sched-treegion-branch/configure.in
branches/sched-treegion-branch/gcc/ChangeLog
branches/sched-treegion-branch/gcc/DATESTAMP
branches/sched-treegion-branch/gcc/Makefile.in
branches/sched-treegion-branch/gcc/ada/ChangeLog
branches/sched-treegion-branch/gcc/ada/s-taprop-hpux-dce.adb
branches/sched-treegion-branch/gcc/builtins.c
branches/sched-treegion-branch/gcc/c-typeck.c
branches/sched-treegion-branch/gcc/config/bfin/bfin.c
branches/sched-treegion-branch/gcc/config/m32c/muldiv.md
branches/sched-treegion-branch/gcc/config/mips/mips.c
branches/sched-treegion-branch/gcc/config/mips/t-rtems
branches/sched-treegion-branch/gcc/config/rs6000/predicates.md
branches/sched-treegion-branch/gcc/config/rs6000/rs6000.c
branches/sched-treegion-branch/gcc/config/sh/lib1funcs.asm
branches/sched-treegion-branch/gcc/config/sh/lib1funcs.h
branches/sched-treegion-branch/gcc/config/sh/sh.c
branches/sched-treegion-branch/gcc/config/sh/sh.md
branches/sched-treegion-branch/gcc/config/sh/t-sh
branches/sched-treegion-branch/gcc/configure
branches/sched-treegion-branch/gcc/configure.ac
branches/sched-treegion-branch/gcc/cp/ChangeLog
branches/sched-treegion-branch/gcc/cp/cp-gimplify.c
branches/sched-treegion-branch/gcc/cp/cp-tree.h
branches/sched-treegion-branch/gcc/cp/decl.c
branches/sched-treegion-branch/gcc/cp/decl2.c
branches/sched-treegion-branch/gcc/cp/name-lookup.c
branches/sched-treegion-branch/gcc/cp/semantics.c
branches/sched-treegion-branch/gcc/cp/typeck2.c
branches/sched-treegion-branch/gcc/doc/extend.texi
branches/sched-treegion-branch/gcc/except.c
branches/sched-treegion-branch/gcc/fold-const.c
branches/sched-treegion-branch/gcc/fortran/ChangeLog
branches/sched-treegion-branch/gcc/fortran/decl.c
branches/sched-treegion-branch/gcc/fortran/f95-lang.c
branches/sched-treegion-branch/gcc/fortran/resolve.c
branches/sched-treegion-branch/gcc/fortran/trans-decl.c
branches/sched-treegion-branch/gcc/fortran/trans-expr.c
branches/sched-treegion-branch/gcc/fortran/trans-openmp.c
branches/sched-treegion-branch/gcc/fortran/trans.h
branches/sched-treegion-branch/gcc/gimplify.c
branches/sched-treegion-branch/gcc/haifa-sched.c
branches/sched-treegion-branch/gcc/java/ChangeLog
branches/sched-treegion-branch/gcc/java/builtins.c
branches/sched-treegion-branch/gcc/java/class.c
branches/sched-treegion-branch/gcc/java/java-gimplify.c
branches/sched-treegion-branch/gcc/longlong.h
branches/sched-treegion-branch/gcc/reload.c
branches/sched-treegion-branch/gcc/reload1.c
branches/sched-treegion-branch/gcc/stor-layout.c
branches/sched-treegion-branch/gcc/testsuite/ChangeLog
branches/sched-treegion-branch/gcc/testsuite/g++.dg/ext/offsetof1.C
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/bf-ms-layout.c
branches/sched-treegion-branch/gcc/testsuite/gcc.dg/bf-no-ms-layout.c
branches/sched-treegion-branch/gcc/testsuite/lib/target-supports-dg.exp
branches/sched-treegion-branch/gcc/tree-flow.h
branches/sched-treegion-branch/gcc/tree-gimple.h
branches/sched-treegion-branch/gcc/tree-inline.c
branches/sched-treegion-branch/gcc/tree-nested.c
branches/sched-treegion-branch/gcc/tree-ssa-loop-ivopts.c
branches/sched-treegion-branch/libcpp/ChangeLog
branches/sched-treegion-branch/libcpp/directives.c
branches/sched-treegion-branch/libcpp/macro.c
branches/sched-treegion-branch/libgomp/ChangeLog
branches/sched-treegion-branch/libgomp/env.c
branches/sched-treegion-branch/libgomp/libgomp.h
branches/sched-treegion-branch/libgomp/team.c
branches/sched-treegion-branch/libjava/ChangeLog
branches/sched-treegion-branch/libjava/Makefile.in
branches/sched-treegion-branch/libjava/classpath/ChangeLog.gcj
branches/sched-treegion-branch/libjava/classpath/Makefile.am
branches/sched-treegion-branch/libjava/classpath/Makefile.in
branches/sched-treegion-branch/libjava/classpath/aclocal.m4
branches/sched-treegion-branch/libjava/classpath/configure
branches/sched-treegion-branch/libjava/classpath/configure.ac
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/java2d/PolyEdge.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurface.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java
branches/sched-treegion-branch/libjava/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h
branches/sched-treegion-branch/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
branches/sched-treegion-branch/libjava/classpath/java/awt/Component.java
branches/sched-treegion-branch/libjava/classpath/java/awt/datatransfer/DataFlavor.java
branches/sched-treegion-branch/libjava/classpath/java/awt/dnd/DropTargetContext.java
branches/sched-treegion-branch/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java
branches/sched-treegion-branch/libjava/classpath/java/awt/font/LineBreakMeasurer.java
branches/sched-treegion-branch/libjava/classpath/java/awt/font/TextLayout.java
branches/sched-treegion-branch/libjava/classpath/java/awt/geom/AffineTransform.java
branches/sched-treegion-branch/libjava/classpath/java/awt/image/BufferedImage.java
branches/sched-treegion-branch/libjava/classpath/java/awt/image/PixelGrabber.java
branches/sched-treegion-branch/libjava/classpath/java/text/Bidi.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/JComponent.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/JTabbedPane.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/RepaintManager.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/text/GapContent.java
branches/sched-treegion-branch/libjava/classpath/javax/swing/text/html/HTMLDocument.java
branches/sched-treegion-branch/libjava/classpath/m4/acinclude.m4
branches/sched-treegion-branch/libjava/classpath/native/Makefile.am
branches/sched-treegion-branch/libjava/classpath/native/Makefile.in
branches/sched-treegion-branch/libjava/classpath/native/jawt/Makefile.am
branches/sched-treegion-branch/libjava/classpath/native/jawt/Makefile.in
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/cairographics2d.h
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
branches/sched-treegion-branch/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
branches/sched-treegion-branch/libjava/classpath/native/plugin/Makefile.am
branches/sched-treegion-branch/libjava/classpath/native/plugin/Makefile.in
branches/sched-treegion-branch/libjava/classpath/native/plugin/gcjwebplugin.cc
branches/sched-treegion-branch/libjava/classpath/tools/Makefile.am
branches/sched-treegion-branch/libjava/classpath/tools/Makefile.in
branches/sched-treegion-branch/libjava/classpath/tools/toolwrapper.c
branches/sched-treegion-branch/libjava/configure
branches/sched-treegion-branch/libjava/configure.ac
branches/sched-treegion-branch/libjava/configure.host
branches/sched-treegion-branch/libjava/gcj/Makefile.in
branches/sched-treegion-branch/libjava/include/Makefile.in
branches/sched-treegion-branch/libjava/java/lang/Class.java
branches/sched-treegion-branch/libjava/java/lang/Thread.java
branches/sched-treegion-branch/libjava/sources.am
branches/sched-treegion-branch/libjava/testsuite/Makefile.in
branches/sched-treegion-branch/zlib/ChangeLog.gcj
branches/sched-treegion-branch/zlib/Makefile.am
branches/sched-treegion-branch/zlib/Makefile.in
branches/sched-treegion-branch/zlib/aclocal.m4
Propchange: branches/sched-treegion-branch/
('svnmerge-integrated' modified)