Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Sun, 27 Nov 2011 21:52:42 +0000 (16:52 -0500)
committerRoland Schulz <roland@utk.edu>
Sun, 27 Nov 2011 21:54:16 +0000 (16:54 -0500)
commit14f86ac4bd73084b5a0cbbdd266b33ad3c53864b
tree82bddc2b995141e3f169c0d747b3a4965c1b5679
parent78dd0f03a14e91f434746f3dee158870c19ff7c2
parent8e623f5c249f97dd1bbcd63d5bef2e14ab7c99e5
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Change-Id: I9f12fee0e49e1f7d758a2080337269753f31f3bf
CMakeLists.txt
src/mdlib/domdec.c