Merge branch release-2016
authorTeemu Murtola <teemu.murtola@gmail.com>
Sat, 21 May 2016 06:01:56 +0000 (09:01 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Sat, 21 May 2016 06:03:21 +0000 (09:03 +0300)
commit32c15c2d0e844110c7988f9d1c5cbcce6b840a12
tree4d28d9b4d81b43e05eee76433404d0d447c7dc02
parentb8a8f32084bd4efd508ad0e58f39fea6c87d9a5c
parent7aa50e4ba9066e0fada0c6c63da08ceeac32dec3
Merge branch release-2016

No conflicts, but removed the -beta1 suffix.

Change-Id: I651a0889b7533626d8ec72fa30e718a23f3cedf7
cmake/gmxVersionInfo.cmake