Fixed compilation of these resolved conflicts as well now.
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 15:16:11 +0000 (17:16 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 15:16:11 +0000 (17:16 +0200)
commit7663d3aca716aef0bc8b2a35d56ce5583ff4de71
tree29df70337e95869af3b2c28a00da5698baff6d47
parente86e2875cfbcc0c82e2f800d91e4b2738fd01a19
Fixed compilation of these resolved conflicts as well now.
include/string2.h
include/vec.h
src/kernel/pdb2top.c