Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ViSTA
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
ViSTA
Commits
5f2a730a
There was a problem fetching the pipeline summary.
Commit
5f2a730a
authored
9 years ago
by
sebastianfreitag
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/1.16' into develop
parents
0747b753
5a8926e6
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp
+1
-1
1 addition, 1 deletion
VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp
VistaCoreLibs/VistaBase/VistaVersion.h
+13
-12
13 additions, 12 deletions
VistaCoreLibs/VistaBase/VistaVersion.h
with
14 additions
and
13 deletions
VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp
+
1
−
1
View file @
5f2a730a
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
/* Contributors */
/* Contributors */
/* */
/* */
/*============================================================================*/
/*============================================================================*/
// $Id: VistaSerializablesTest.cpp 38623 2013-10-10 16:36:10Z dr165799 $
...
...
This diff is collapsed.
Click to expand it.
VistaCoreLibs/VistaBase/VistaVersion.h
+
13
−
12
View file @
5f2a730a
...
@@ -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.1
5
</b></td>
* <td align="left"><b>1.1
6
</b></td>
* </tr>
* </tr>
* <tr>
* <tr>
* <td align="right">codename:</td>
* <td align="right">codename:</td>
* <td align="left"><b>ViSTA
CONCORD
E</b></td>
* <td align="left"><b>ViSTA
HUBBL
E</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> </td></tr>
* <tr><td colspan=2> </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> </td></tr>
* <tr><td colspan=2> </td></tr>
* <tr>
* <tr>
* <td align="right">full version:</td>
* <td align="right">full version:</td>
* <td align="left"><b>1.1
5
.0</b></td>
* <td align="left"><b>1.1
6
.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 "
CONCORD
E"
//#define VISTA_RELEASE_NAME "
HUBBL
E"
#define VISTA_VERSION "1.1
5
.0"
#define VISTA_VERSION "1.1
6
.0"
#define VISTA_MAJOR 1
#define VISTA_MAJOR 1
#define VISTA_MINOR 1
5
#define VISTA_MINOR 1
6
#define VISTA_REVISION 0
#define VISTA_REVISION 0
/*============================================================================*/
/*============================================================================*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment