tree efc137a00553b1df4253b6b95728c417e3d9d77d
parent 850276d2b445aecc19c48c764865fc697d87739c
parent a1b9465bf85621f80f02b9903aa7b38a74676df1
author Brad King <brad.king@kitware.com> 1383671188 -0500
committer Brad King <brad.king@kitware.com> 1383671188 -0500

Merge branch 'fix-automoc-compile-definitions' into release