Skip to content
Snippets Groups Projects
Commit 5f2a730a authored by sebastianfreitag's avatar sebastianfreitag
Browse files

Merge branch 'release/1.16' into develop

parents 0747b753 5a8926e6
Branches
No related tags found
No related merge requests found
Pipeline #
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/* Contributors */ /* Contributors */
/* */ /* */
/*============================================================================*/ /*============================================================================*/
// $Id: VistaSerializablesTest.cpp 38623 2013-10-10 16:36:10Z dr165799 $
......
...@@ -36,29 +36,30 @@ ...@@ -36,29 +36,30 @@
* <table border=0> * <table border=0>
* <tr> * <tr>
* <td align="right">API version:</td> * <td align="right">API version:</td>
* <td align="left"><b>1.15</b></td> * <td align="left"><b>1.16</b></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="right">codename:</td> * <td align="right">codename:</td>
* <td align="left"><b>ViSTA CONCORDE</b></td> * <td align="left"><b>ViSTA HUBBLE</b></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="right">API release date:</td> * <td align="right">API release date:</td>
* <td align="left"><b>January 21st, 2016</b></td> * <td align="left"><b>May 20th, 2016</b></td>
* </tr> * </tr>
* <tr><td colspan=2>&nbsp;</td></tr> * <tr><td colspan=2>&nbsp;</td></tr>
* <tr><td align="center" colspan=2><i>This is the ViSTA release 1.16.0, codename "CONCORDE".</i></td></tr> * <tr><td align="center" colspan=2><i>This is the ViSTA release 1.16.0, codename "HUBBLE".</i></td></tr>
* <tr><td align="center" colspan=2><i>It is dedicated to the Concorde, which was the fastest</i></td></tr> * <tr><td align="center" colspan=2><i>It is dedicated to the Hubble Space Telescope, one of the</i></td></tr>
* <tr><td align="center" colspan=2><i>commercial aircraft during its time and was introduced</i></td></tr> * <tr><td align="center" colspan=2><i>largest and most versatile space telescopes, observing in the</i></td></tr>
* <tr><td align="center" colspan=2><i>on January 21, 1976. </i></td></tr> * <tr><td align="center" colspan=2><i>infrared, visible and ultraviolet spectra.</i></td></tr>
* <tr><td align="center" colspan=2><i>It entered service on May 20th, 1990.</i></td></tr>
* <tr><td colspan=2>&nbsp;</td></tr> * <tr><td colspan=2>&nbsp;</td></tr>
* <tr> * <tr>
* <td align="right">full version:</td> * <td align="right">full version:</td>
* <td align="left"><b>1.15.0</b></td> * <td align="left"><b>1.16.0</b></td>
* </tr> * </tr>
* <tr> * <tr>
* <td align="right">release date:</td> * <td align="right">release date:</td>
* <td align="left"><b>January 21st, 2016</b></td> * <td align="left"><b>May 20th, 2016</b></td>
* </tr> * </tr>
* </table> * </table>
* </div> * </div>
...@@ -68,10 +69,10 @@ ...@@ -68,10 +69,10 @@
#define VISTA_HEAD #define VISTA_HEAD
#define VISTA_RELEASE_NAME "HEAD" #define VISTA_RELEASE_NAME "HEAD"
//#define VISTA_RELEASE_NAME "CONCORDE" //#define VISTA_RELEASE_NAME "HUBBLE"
#define VISTA_VERSION "1.15.0" #define VISTA_VERSION "1.16.0"
#define VISTA_MAJOR 1 #define VISTA_MAJOR 1
#define VISTA_MINOR 15 #define VISTA_MINOR 16
#define VISTA_REVISION 0 #define VISTA_REVISION 0
/*============================================================================*/ /*============================================================================*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment