Merge branch 'release9.2/fixes/nullptr-compatibility' into release9.2/fixes/jenkins-fix
authorJohn Detter <jdetter@wisc.edu>
Mon, 29 Aug 2016 14:54:14 +0000 (09:54 -0500)
committerJohn Detter <jdetter@wisc.edu>
Mon, 29 Aug 2016 14:54:14 +0000 (09:54 -0500)
commit9411854e98ae5d3a5a49679b8fabdb01d9bffaef
treed0d8a74477b0ae196ed43505401f64464d6ea0df
parent77c0196ed4cc2ddeabb43e5c5ba7b484126aa303
parente87877a5b1d09e0883c88ee620a2b1afec954b88
Merge branch 'release9.2/fixes/nullptr-compatibility' into release9.2/fixes/jenkins-fix