Skip to content

Commit

Permalink
[release] prepare v1.1 openMVG#712
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoulon committed Dec 27, 2016
1 parent ab4db74 commit e61aff4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docs/sphinx/rst/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@

# General information about the project.
project = u'openMVG'
copyright = u'2013-2015, OpenMVG authors'
copyright = u'2013-2016, OpenMVG authors'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.9'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '0.9'
release = '1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -280,7 +280,7 @@
epub_title = u'openMVG'
epub_author = u'openMVG authors'
epub_publisher = u'Pierre MOULON & Bruno DUISIT & Fabien CASTAN'
epub_copyright = u'2013-2015, openMVG authors'
epub_copyright = u'2013-2016, openMVG authors'

# The basename for the epub file. It defaults to the project name.
#epub_basename = u'openMVG'
Expand Down
4 changes: 2 additions & 2 deletions src/openMVG/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
#define OPENMVG_VERSION_H_

#define OPENMVG_VERSION_MAJOR 1
#define OPENMVG_VERSION_MINOR 0
#define OPENMVG_VERSION_MINOR 1
#define OPENMVG_VERSION_REVISION 0

// Preprocessor to string conversion
#define OPENMVG_TO_STRING_HELPER(x) #x
#define OPENMVG_TO_STRING(x) OPENMVG_TO_STRING_HELPER(x)

// OpenMVG version as a string; for example "1.0.0".
// OpenMVG version as a string; for example "1.1.0".
#define OPENMVG_VERSION_STRING OPENMVG_TO_STRING(OPENMVG_VERSION_MAJOR) "." \
OPENMVG_TO_STRING(OPENMVG_VERSION_MINOR) "." \
OPENMVG_TO_STRING(OPENMVG_VERSION_REVISION)
Expand Down

0 comments on commit e61aff4

Please sign in to comment.