Skip to content

Commit

Permalink
Bump version number
Browse files Browse the repository at this point in the history
  • Loading branch information
darbyjohnston committed Jun 11, 2015
1 parent 44a0637 commit 6831e96
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#
# Git example for tagging a version:
#
# > git tag -a 1.1.0 -m "Version 1.1.0" df2f2e21232ceeab85ca40fc988aba5591fe9e64
# > git push origin 1.1.0
# > git tag -a 1.1.1 -m "Version 1.1.1" df2f2e21232ceeab85ca40fc988aba5591fe9e64
# > git push origin 1.1.1
#
# When new image I/O file extensions are added to DJV the following files need
# to be updated:
Expand All @@ -30,7 +30,7 @@ cmake_policy(SET CMP0020 OLD)

set(djvVersionMajor "1")
set(djvVersionMinor "1")
set(djvVersionPatch "0")
set(djvVersionPatch "1")

set(djvVersion ${djvVersionMajor}.${djvVersionMinor}.${djvVersionPatch})

Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "DJV"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.1.0
PROJECT_NUMBER = 1.1.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
31 changes: 17 additions & 14 deletions doc/djvChangeList.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@
<title>DJV Imaging - Change List</title>
</head>

<body>

<div class="header">
<div style="position:absolute; top:10; left:10; height:50;">
<a href="index.html"><img src="images/djvTitle.gif" align="middle"></a>
</div>
<div style="position:absolute; top:0; right:0;">
<a href="index.html"><img src="images/djvLogo.gif"></a>
</div>
<body>

<div class="header">
<div style="position:absolute; top:10; left:10; height:50;">
<a href="index.html"><img src="images/djvTitle.gif" align="middle"></a>
</div>
<div style="position:absolute; top:0; right:0;">
<a href="index.html"><img src="images/djvLogo.gif"></a>
</div>
<table width="100%" height="100%">
<tr>
<td align="center" valign="bottom">
<a class="nav" href="index.html">Home</a>
<a class="nav" href="djvScreenshots.html">Screenshots</a>
<a class="nav" href="djvDocumentation.html">Documentation</a>
<a class="nav" href="djvCredits.html">Credits</a>
<a class="nav" href="djvLegal.html">Legal</a>
<a class="nav" href="index.html">Home</a>
<a class="nav" href="djvScreenshots.html">Screenshots</a>
<a class="nav" href="djvDocumentation.html">Documentation</a>
<a class="nav" href="djvCredits.html">Credits</a>
<a class="nav" href="djvLegal.html">Legal</a>
</td>
</tr>
</table>
Expand All @@ -64,6 +64,7 @@
<td class="sidebar" valign="top">

<h3>Change List</h3>
<li><a href="#1.1.1">1.1.1</a></li>
<li><a href="#1.1.0">1.1.0</a></li>
<li><a href="#1.0.5">1.0.5</a></li>
<li><a href="#1.0.4">1.0.4</a></li>
Expand All @@ -76,6 +77,8 @@ <h3>Change List</h3>

<td class="content" valign="top">

<h3><a name="1.1.1">Version 1.1.1</a></h3>

<h3><a name="1.1.0">Version 1.1.0</a></h3>
<h4>Features:</h4>
<ul>
Expand Down

0 comments on commit 6831e96

Please sign in to comment.