Skip to content

Commit

Permalink
Updated to version 1.5.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
eddiecohen committed Nov 12, 2013
1 parent 98d33a8 commit 6e4a41b
Show file tree
Hide file tree
Showing 9 changed files with 561 additions and 88 deletions.
Binary file modified Documentation/OpenNI.chm
Binary file not shown.
2 changes: 1 addition & 1 deletion Include/XnVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/** OpenNI maintenance version. */
#define XN_MAINTENANCE_VERSION 7
/** OpenNI build version. */
#define XN_BUILD_VERSION 8
#define XN_BUILD_VERSION 10

/** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */
#define XN_BRIEF_VERSION_STRING \
Expand Down
629 changes: 551 additions & 78 deletions NOTICE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Platform/Linux/Build/Res/AssemblyInfo-OpenNI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.7.8")]
[assembly: AssemblyFileVersion("1.5.7.8")]
[assembly: AssemblyVersion("1.5.7.10")]
[assembly: AssemblyFileVersion("1.5.7.10")]
4 changes: 2 additions & 2 deletions Platform/Win32/Build/Res/AssemblyInfo-OpenNI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.7.8")]
[assembly: AssemblyFileVersion("1.5.7.8")]
[assembly: AssemblyVersion("1.5.7.10")]
[assembly: AssemblyFileVersion("1.5.7.10")]
2 changes: 1 addition & 1 deletion Platform/Win32/CreateRedist/RedistMaker.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set MAJOR_VERSION=1
set MINOR_VERSION=5
set MAINTENANCE_VERSION=7
set BUILD_VERSION=8
set BUILD_VERSION=10


@echo ************************
Expand Down
2 changes: 1 addition & 1 deletion Platform/Win32/CreateRedist/UpdateVersion.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
VERSION_MAJOR = 1
VERSION_MINOR = 5
VERSION_MAINTENANCE = 7
VERSION_BUILD = 8
VERSION_BUILD = 10

class UpdateVersion:
def main(self):
Expand Down
2 changes: 1 addition & 1 deletion Platform/Win32/Install/OpenNI/Includes/OpenNIVariables.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<?define MinorVersion=5?>
<?define MaintenanceVersion=7?>
<!-- BuildVersion is NOT used by WiX in the upgrade procedure -->
<?define BuildVersion=8?>
<?define BuildVersion=10?>
<!-- Full version number to display -->
<?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.MaintenanceVersion).$(var.BuildVersion)"?>

Expand Down
4 changes: 2 additions & 2 deletions Wrappers/OpenNI.net/PublisherPolicy.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<dependentAssembly>
<assemblyIdentity name="OpenNI.Net" publicKeyToken="6b43d0c6cf74ee7f"/>
<!-- Redirecting to newest version (we're backwards compatible to versions up to 1.1.0.31). -->
<bindingRedirect oldVersion="1.1.0.31 - 1.5.7.8"
newVersion="1.5.7.8"/>
<bindingRedirect oldVersion="1.1.0.31 - 1.5.7.10"
newVersion="1.5.7.10"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down

0 comments on commit 6e4a41b

Please sign in to comment.