Auto-merging test/version.cpp
CONFLICT (add/add): Merge conflict in test/version.cpp
Auto-merging test/make.cpp
CONFLICT (add/add): Merge conflict in test/make.cpp
Auto-merging test/macos_vs_bsd.c
CONFLICT (add/add): Merge conflict in test/macos_vs_bsd.c
Auto-merging test/macos_endian.c
CONFLICT (add/add): Merge conflict in test/macos_endian.c
Auto-merging test/info_as_objcpp.mm
CONFLICT (add/add): Merge conflict in test/info_as_objcpp.mm
Auto-merging test/info_as_objc.m
CONFLICT (add/add): Merge conflict in test/info_as_objc.m
Auto-merging test/info_as_cpp.cpp
CONFLICT (add/add): Merge conflict in test/info_as_cpp.cpp
Auto-merging test/info_as_c.c
CONFLICT (add/add): Merge conflict in test/info_as_c.c
Auto-merging test/build.jam
CONFLICT (add/add): Merge conflict in test/build.jam
Auto-merging index.html
CONFLICT (add/add): Merge conflict in index.html
Auto-merging include/boost/predef/version_number.h
CONFLICT (add/add): Merge conflict in include/boost/predef/version_number.h
Auto-merging include/boost/predef/platform/mingw.h
CONFLICT (add/add): Merge conflict in include/boost/predef/platform/mingw.h
Auto-merging include/boost/predef/platform.h
CONFLICT (add/add): Merge conflict in include/boost/predef/platform.h
Auto-merging include/boost/predef/other/endian.h
CONFLICT (add/add): Merge conflict in include/boost/predef/other/endian.h
Auto-merging include/boost/predef/other.h
CONFLICT (add/add): Merge conflict in include/boost/predef/other.h
Auto-merging include/boost/predef/os/windows.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/windows.h
Auto-merging include/boost/predef/os/vms.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/vms.h
Auto-merging include/boost/predef/os/unix.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/unix.h
Auto-merging include/boost/predef/os/solaris.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/solaris.h
Auto-merging include/boost/predef/os/qnxnto.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/qnxnto.h
Auto-merging include/boost/predef/os/os400.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/os400.h
Auto-merging include/boost/predef/os/macos.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/macos.h
Auto-merging include/boost/predef/os/linux.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/linux.h
Auto-merging include/boost/predef/os/irix.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/irix.h
Auto-merging include/boost/predef/os/hpux.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/hpux.h
Auto-merging include/boost/predef/os/cygwin.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/cygwin.h
Auto-merging include/boost/predef/os/bsd/open.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd/open.h
Auto-merging include/boost/predef/os/bsd/net.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd/net.h
Auto-merging include/boost/predef/os/bsd/free.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd/free.h
Auto-merging include/boost/predef/os/bsd/dragonfly.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd/dragonfly.h
Auto-merging include/boost/predef/os/bsd/bsdi.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd/bsdi.h
Auto-merging include/boost/predef/os/bsd.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/bsd.h
Auto-merging include/boost/predef/os/beos.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/beos.h
Auto-merging include/boost/predef/os/android.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/android.h
Auto-merging include/boost/predef/os/amigaos.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/amigaos.h
Auto-merging include/boost/predef/os/aix.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os/aix.h
Auto-merging include/boost/predef/os.h
CONFLICT (add/add): Merge conflict in include/boost/predef/os.h
Auto-merging include/boost/predef/make.h
CONFLICT (add/add): Merge conflict in include/boost/predef/make.h
Auto-merging include/boost/predef/library/std/vacpp.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/vacpp.h
Auto-merging include/boost/predef/library/std/stlport.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/stlport.h
Auto-merging include/boost/predef/library/std/stdcpp3.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/stdcpp3.h
Auto-merging include/boost/predef/library/std/sgi.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/sgi.h
Auto-merging include/boost/predef/library/std/roguewave.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/roguewave.h
Auto-merging include/boost/predef/library/std/msl.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/msl.h
Auto-merging include/boost/predef/library/std/modena.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/modena.h
Auto-merging include/boost/predef/library/std/libcomo.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/libcomo.h
Auto-merging include/boost/predef/library/std/dinkumware.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/dinkumware.h
Auto-merging include/boost/predef/library/std/cxx.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/cxx.h
Auto-merging include/boost/predef/library/std/_prefix.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std/_prefix.h
Auto-merging include/boost/predef/library/std.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/std.h
Auto-merging include/boost/predef/library/c/zos.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c/zos.h
Auto-merging include/boost/predef/library/c/vms.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c/vms.h
Auto-merging include/boost/predef/library/c/uc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c/uc.h
Auto-merging include/boost/predef/library/c/gnu.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c/gnu.h
Auto-merging include/boost/predef/library/c/_prefix.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c/_prefix.h
Auto-merging include/boost/predef/library/c.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library/c.h
Auto-merging include/boost/predef/library.h
CONFLICT (add/add): Merge conflict in include/boost/predef/library.h
Auto-merging include/boost/predef/language/stdcpp.h
CONFLICT (add/add): Merge conflict in include/boost/predef/language/stdcpp.h
Auto-merging include/boost/predef/language/stdc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/language/stdc.h
Auto-merging include/boost/predef/language/objc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/language/objc.h
Auto-merging include/boost/predef/language.h
CONFLICT (add/add): Merge conflict in include/boost/predef/language.h
Auto-merging include/boost/predef/detail/test.h
CONFLICT (add/add): Merge conflict in include/boost/predef/detail/test.h
Auto-merging include/boost/predef/detail/os_detected.h
CONFLICT (add/add): Merge conflict in include/boost/predef/detail/os_detected.h
Auto-merging include/boost/predef/detail/endian_compat.h
CONFLICT (add/add): Merge conflict in include/boost/predef/detail/endian_compat.h
Auto-merging include/boost/predef/detail/_exception.h
CONFLICT (add/add): Merge conflict in include/boost/predef/detail/_exception.h
Auto-merging include/boost/predef/detail/_cassert.h
CONFLICT (add/add): Merge conflict in include/boost/predef/detail/_cassert.h
Auto-merging include/boost/predef/compiler/watcom.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/watcom.h
Auto-merging include/boost/predef/compiler/visualc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/visualc.h
Auto-merging include/boost/predef/compiler/tendra.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/tendra.h
Auto-merging include/boost/predef/compiler/sunpro.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/sunpro.h
Auto-merging include/boost/predef/compiler/sgi_mipspro.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/sgi_mipspro.h
Auto-merging include/boost/predef/compiler/pgi.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/pgi.h
Auto-merging include/boost/predef/compiler/palm.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/palm.h
Auto-merging include/boost/predef/compiler/mpw.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/mpw.h
Auto-merging include/boost/predef/compiler/microtec.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/microtec.h
Auto-merging include/boost/predef/compiler/metrowerks.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/metrowerks.h
Auto-merging include/boost/predef/compiler/metaware.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/metaware.h
Auto-merging include/boost/predef/compiler/llvm.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/llvm.h
Auto-merging include/boost/predef/compiler/kai.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/kai.h
Auto-merging include/boost/predef/compiler/intel.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/intel.h
Auto-merging include/boost/predef/compiler/ibm.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/ibm.h
Auto-merging include/boost/predef/compiler/iar.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/iar.h
Auto-merging include/boost/predef/compiler/hp_acc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/hp_acc.h
Auto-merging include/boost/predef/compiler/greenhills.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/greenhills.h
Auto-merging include/boost/predef/compiler/gcc_xml.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/gcc_xml.h
Auto-merging include/boost/predef/compiler/gcc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/gcc.h
Auto-merging include/boost/predef/compiler/ekopath.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/ekopath.h
Auto-merging include/boost/predef/compiler/edg.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/edg.h
Auto-merging include/boost/predef/compiler/dignus.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/dignus.h
Auto-merging include/boost/predef/compiler/digitalmars.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/digitalmars.h
Auto-merging include/boost/predef/compiler/diab.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/diab.h
Auto-merging include/boost/predef/compiler/compaq.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/compaq.h
Auto-merging include/boost/predef/compiler/comeau.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/comeau.h
Auto-merging include/boost/predef/compiler/clang.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/clang.h
Auto-merging include/boost/predef/compiler/borland.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler/borland.h
Auto-merging include/boost/predef/compiler.h
CONFLICT (add/add): Merge conflict in include/boost/predef/compiler.h
Auto-merging include/boost/predef/architecture/z.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/z.h
Auto-merging include/boost/predef/architecture/x86/64.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/x86/64.h
Auto-merging include/boost/predef/architecture/x86/32.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/x86/32.h
Auto-merging include/boost/predef/architecture/x86.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/x86.h
Auto-merging include/boost/predef/architecture/sys390.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/sys390.h
Auto-merging include/boost/predef/architecture/sys370.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/sys370.h
Auto-merging include/boost/predef/architecture/superh.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/superh.h
Auto-merging include/boost/predef/architecture/sparc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/sparc.h
Auto-merging include/boost/predef/architecture/rs6k.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/rs6k.h
Auto-merging include/boost/predef/architecture/pyramid.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/pyramid.h
Auto-merging include/boost/predef/architecture/ppc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/ppc.h
Auto-merging include/boost/predef/architecture/parisc.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/parisc.h
Auto-merging include/boost/predef/architecture/mips.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/mips.h
Auto-merging include/boost/predef/architecture/m68k.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/m68k.h
Auto-merging include/boost/predef/architecture/ia64.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/ia64.h
Auto-merging include/boost/predef/architecture/convex.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/convex.h
Auto-merging include/boost/predef/architecture/blackfin.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/blackfin.h
Auto-merging include/boost/predef/architecture/arm.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/arm.h
Auto-merging include/boost/predef/architecture/alpha.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture/alpha.h
Auto-merging include/boost/predef/architecture.h
CONFLICT (add/add): Merge conflict in include/boost/predef/architecture.h
Auto-merging include/boost/predef.h
CONFLICT (add/add): Merge conflict in include/boost/predef.h
Auto-merging doc/predef.qbk
CONFLICT (add/add): Merge conflict in doc/predef.qbk
Auto-merging doc/build.jam
CONFLICT (add/add): Merge conflict in doc/build.jam
Automatic merge failed; fix conflicts and then commit the result.