fixed conflicts.
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 14:59:00 +0000 (16:59 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 14:59:00 +0000 (16:59 +0200)
commite86e2875cfbcc0c82e2f800d91e4b2738fd01a19
treefea7494b021d1f822c2bb589ee05b1107a757c14
parent56968b5103f12a6a37a4c255bd0934bc4c080ce8
fixed conflicts.
include/resall.h
include/string2.h
include/thread_mpi/atomic/xlc_ppc.h
include/vec.h
src/kernel/pdb2top.c