Merge cleanup fixes before static array optimizations
authorPhilip Miller <phil@itu.(none)>
Sun, 14 Nov 2010 07:18:39 +0000 (01:18 -0600)
committerPhilip Miller <phil@itu.(none)>
Sun, 14 Nov 2010 07:18:39 +0000 (01:18 -0600)
commit3b89b2663824775fb0c02eed1295c57c26c64101
tree885e160727c62e967cbf16ae7a5fe789d17cc4ad
parent7f84620d396d6d4ee1e976ac553379a83fdfc5a7
parentdbd5693430146b57fc714c20f368e35ec83529b3
Merge cleanup fixes before static array optimizations

Conflicts:
src/ck-core/cklocation.C
This was just Abhinav's name change of dimInfo to arrayMapInfo.
src/ck-core/cklocation.C
src/scripts/configure
src/scripts/configure.in
src/scripts/conv-autoconfig.h.in