Skip to content

Commit 6b96694

Browse files
committed
Merge pull request #83 from eile/master
Release preparation
2 parents a3f1948 + 1fdc9b6 commit 6b96694

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.gitexternals

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# -*- mode: cmake -*-
2-
# CMake/common https://github.com/Eyescale/CMake.git c351af3
2+
# CMake/common https://github.com/Eyescale/CMake.git dd25554

.gitsubprojects

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# -*- mode: cmake -*-
2-
git_subproject(Servus https://github.com/HBPVIS/Servus ba92d76)
2+
git_subproject(Servus https://github.com/HBPVIS/Servus ea759d8)

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include(GitExternal)
1313
set(VERSION_MAJOR 0)
1414
set(VERSION_MINOR 10)
1515
set(VERSION_PATCH 0)
16-
set(VERSION_ABI 2)
16+
set(VERSION_ABI 3)
1717

1818
set(DEFLECT_DESCRIPTION "A fast C++ library for streaming pixels and events")
1919
set(DEFLECT_MAINTAINER "Blue Brain Project <[email protected]>")

doc/Changelog.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Changelog {#Changelog}
22
============
33

4-
## Deflect 0.10 (git master)
4+
## git master
5+
6+
## Deflect 0.10
57
* [79](https://github.com/BlueBrain/Deflect/pull/79):
68
DesktopStreamer: Support multi-window streaming on OS X, fix mouse
79
event handling for retina devices, fix crash on stream close from

0 commit comments

Comments
 (0)