Skip to content

Commit

Permalink
pre-release 1.2.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mistafunk committed Jun 11, 2018
1 parent f60aca6 commit 7fca9d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Palladio ChangeLog

## v1.2.0-rc.1 (Jun 11, 2018)
* Support for inter-shape occlusion queries (#33).

## v1.1.1 (Apr 16, 2018)
* Fixed asset loading issues in Windows build (#88).

Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/dependencies.cmake)
### versioning

set(PLD_VERSION_MAJOR 1)
set(PLD_VERSION_MINOR 1)
set(PLD_VERSION_PATCH 1)
set(PLD_VERSION_MINOR 2)
set(PLD_VERSION_PATCH 0-rc.1)
if(NOT PLD_VERSION_BUILD)
set(PLD_VERSION_BUILD DEV)
endif()
Expand Down

0 comments on commit 7fca9d5

Please # to comment.