Revertiing my fake merge to make history consistent
commit1c10c0da3abef4d51f8f0c2e2ee4960960d38f87
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 26 Aug 2010 08:08:45 +0000 (26 10:08 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 26 Aug 2010 08:08:45 +0000 (26 10:08 +0200)
tree753f0696ac7e974412afff1797e2e87cb3fac35b
parent5e3473a12e722b233f30e469f6747f2eee73429a
Revertiing my fake merge to make history consistent

Revert "Merge branch 'release-4-5-patches'"

This reverts commit 5e3473a12e722b233f30e469f6747f2eee73429a.
399 files changed:
configure.ac
include/3dview.h
include/assert.h
include/atomprop.h
include/bondf.h
include/calcgrid.h
include/calch.h
include/calcmu.h
include/centerofmass.h
include/chargegroup.h
include/checkpoint.h
include/confio.h
include/constr.h
include/copyrite.h
include/coulomb.h
include/dihre.h
include/displacement.h
include/disre.h
include/do_fit.h
include/domdec.h
include/domdec_network.h
include/ebin.h
include/edsam.h
include/enxio.h
include/ffscanf.h
include/filenm.h
include/force.h
include/futil.h
include/gbutil.h
include/gen_ad.h
include/genborn.h
include/gmx_arpack.h
include/gmx_blas.h
include/gmx_fatal.h
include/gmx_ga2la.h
include/gmx_lapack.h
include/gmx_matrix.h
include/gmx_parallel_3dfft.h
include/gmx_random.h
include/gmx_sse2_double.h
include/gmx_sse2_single.h
include/gmx_statistics.h
include/gmx_system_xdr.h
include/gmx_wallcycle.h
include/gmxcomplex.h
include/gmxcpp.h
include/gmxfio.h
include/gpp_atomtype.h
include/gpp_nextnb.h
include/grompp.h
include/gstat.h
include/hackblock.h
include/histogram.h
include/index.h
include/indexutil.h
include/invblock.h
include/macros.h
include/magic.h
include/main.h
include/maths.h
include/matio.h
include/mdatoms.h
include/mdebin.h
include/mdrun.h
include/mshift.h
include/mtop_util.h
include/mtxio.h
include/mvdata.h
include/names.h
include/nbsearch.h
include/network.h
include/nrama.h
include/nrjac.h
include/nrnb.h
include/ns.h
include/nsgrid.h
include/oenv.h
include/orires.h
include/partdec.h
include/pbc.h
include/pdb2top.h
include/pdbio.h
include/perf_est.h
include/physics.h
include/pme.h
include/poscalc.h
include/position.h
include/pppm.h
include/princ.h
include/pull.h
include/qmmm.h
include/random.h
include/rbin.h
include/rdgroup.h
include/readinp.h
include/resall.h
include/rmpbc.h
include/selection.h
include/selmethod.h
include/selparam.h
include/selvalue.h
include/sfactor.h
include/shellfc.h
include/shift.h
include/sighandler.h
include/smalloc.h
include/sortwater.h
include/sparsematrix.h
include/split.h
include/splitter.h
include/statutil.h
include/strdb.h
include/string2.h
include/symtab.h
include/sysstuff.h
include/tgroup.h
include/thread_mpi/atomic.h
include/thread_mpi/atomic/xlc_ppc.h
include/topsort.h
include/toputil.h
include/tpxio.h
include/trajana.h
include/trnio.h
include/txtdump.h
include/typedefs.h
include/types/atoms.h
include/types/block.h
include/types/commrec.h
include/types/constr.h
include/types/energy.h
include/types/enums.h
include/types/fcdata.h
include/types/filenm.h
include/types/forcerec.h
include/types/genborn.h
include/types/graph.h
include/types/group.h
include/types/idef.h
include/types/ifunc.h
include/types/inputrec.h
include/types/ishift.h
include/types/matrix.h
include/types/mdatom.h
include/types/nblist.h
include/types/nrnb.h
include/types/ns.h
include/types/nsgrid.h
include/types/oenv.h
include/types/pbc.h
include/types/qmmmrec.h
include/types/shellfc.h
include/types/simple.h
include/types/state.h
include/types/symtab.h
include/types/topology.h
include/types/trx.h
include/update.h
include/vcm.h
include/vec.h
include/viewit.h
include/vsite.h
include/warninp.h
include/wgms.h
include/wman.h
include/writeps.h
include/xdrf.h
include/xtcio.h
include/xvgr.h
share/top/charmm27.ff/aminoacids.arn
share/top/charmm27.ff/aminoacids.c.tdb
share/top/charmm27.ff/aminoacids.n.tdb
share/top/charmm27.ff/aminoacids.rtp
share/top/charmm27.ff/ffnonbonded.itp
share/top/charmm27.ff/forcefield.doc
share/top/charmm27.ff/forcefield.itp
share/top/charmm27.ff/watermodels.dat
src/gmxlib/atomprop.c
src/gmxlib/checkpoint.c
src/gmxlib/filenm.c
src/gmxlib/futil.c
src/gmxlib/genversion.sh
src/gmxlib/gmxcpp.c
src/gmxlib/index.c
src/gmxlib/libgmx.pc.in
src/gmxlib/libxdrf.c
src/gmxlib/main.c
src/gmxlib/matio.c
src/gmxlib/nonbonded/nb_kernel_f77_double/Makefile.am
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel010_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel010_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel020_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel020_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel030_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel030_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel100_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel100_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel101_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel101_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel102_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel102_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel103_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel103_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel104_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel104_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel110_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel110_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel111_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel111_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel112_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel112_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel113_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel113_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel114_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel114_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel120_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel120_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel121_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel121_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel122_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel122_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel123_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel123_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel124_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel124_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel130_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel130_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel131_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel131_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel132_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel132_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel133_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel133_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel134_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel134_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel200_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel200_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel201_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel201_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel202_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel202_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel203_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel203_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel204_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel204_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel210_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel210_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel211_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel211_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel212_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel212_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel213_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel213_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel214_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel214_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel220_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel220_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel221_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel221_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel222_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel222_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel223_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel223_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel224_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel224_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel230_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel230_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel231_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel231_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel232_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel232_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel233_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel233_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel234_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel234_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel300_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel300_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel301_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel301_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel302_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel302_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel303_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel303_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel304_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel304_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel310_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel310_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel311_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel311_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel312_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel312_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel313_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel313_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel314_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel314_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel320_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel320_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel321_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel321_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel322_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel322_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel323_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel323_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel324_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel324_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel330_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel330_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel331_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel331_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel332_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel332_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel333_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel333_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel334_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel334_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel400_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel400_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel410_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel410_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel420_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel420_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel430_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel430_f77_double.h
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel_f77_double.c
src/gmxlib/nonbonded/nb_kernel_f77_double/nb_kernel_f77sync.c
src/gmxlib/nonbonded/nb_kernel_ia32_sse/nb_kernel400_ia32_sse.c [copied from src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel400_ia32_sse2.c with 100% similarity]
src/gmxlib/nonbonded/nb_kernel_ia32_sse/nb_kernel410_ia32_sse.c [copied from src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel410_ia32_sse2.c with 100% similarity]
src/gmxlib/nonbonded/nb_kernel_ia32_sse/nb_kernel430_ia32_sse.c [copied from src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel430_ia32_sse2.c with 99% similarity]
src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel400_ia32_sse2.c
src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel410_ia32_sse2.c
src/gmxlib/nonbonded/nb_kernel_ia32_sse2/nb_kernel430_ia32_sse2.c
src/gmxlib/nonbonded/nb_kernel_x86_64_sse2/nb_kernel430_x86_64_sse2.c
src/gmxlib/nrama.c
src/gmxlib/pargs.c
src/gmxlib/pdbio.c
src/gmxlib/readinp.c
src/gmxlib/selection/scanner.c
src/gmxlib/selection/scanner.l
src/gmxlib/selection/scanner_internal.c
src/gmxlib/selection/selmethod.c
src/gmxlib/selection/symrec.c
src/gmxlib/strdb.c
src/gmxlib/string2.c
src/gmxlib/tpxio.c
src/gmxlib/trajana/trajana.c
src/gmxlib/wman.c
src/gmxlib/xdrd.c
src/gmxlib/xvgr.c
src/kernel/add_par.c
src/kernel/fflibutil.c
src/kernel/fflibutil.h
src/kernel/g_x2top.c
src/kernel/g_x2top.h
src/kernel/gctio.c
src/kernel/gen_vsite.c
src/kernel/gen_vsite.h
src/kernel/genhydro.c
src/kernel/gpp_bond_atomtype.c
src/kernel/h_db.c
src/kernel/h_db.h
src/kernel/hizzie.c
src/kernel/libgmxpreprocess.pc.in
src/kernel/nm2type.c
src/kernel/openmm_wrapper.cpp
src/kernel/pdb2gmx.c
src/kernel/pdb2top.c
src/kernel/pgutil.c
src/kernel/readir.c
src/kernel/readpull.c
src/kernel/resall.c
src/kernel/specbond.c
src/kernel/ter_db.c
src/kernel/ter_db.h
src/kernel/tomorse.c
src/kernel/topdirs.c
src/kernel/topio.c
src/kernel/toppush.c
src/kernel/vsite_parm.c
src/kernel/xlate.c
src/kernel/xlate.h
src/mdlib/gmx_qhop_xml.c
src/mdlib/libmd.pc.in
src/mdlib/pme_pp.c
src/mdlib/sim_util.c
src/ngmx/dialogs.c
src/ngmx/xdlg.c
src/ngmx/xdlghi.c
src/ngmx/xstat.c
src/tools/dlist.c
src/tools/do_dssp.c
src/tools/gmx_cluster.c
src/tools/gmx_covar.c
src/tools/gmx_enemat.c
src/tools/gmx_energy.c
src/tools/gmx_genbox.c
src/tools/gmx_genion.c
src/tools/gmx_hbond.c
src/tools/gmx_membed.c
src/tools/libgmxana.pc.in
src/tools/make_ndx.c