Merge branch 'master' into dev

This commit is contained in:
Linus Probert 2018-12-04 14:30:20 +01:00
commit 4d01251d1f
2 changed files with 3 additions and 1 deletions

View File

@ -7,7 +7,7 @@ project(breakhack C)
set(breakhack_GAME_TITLE "BreakHack")
set(breakhack_MAJOR_VERSION 2)
set(breakhack_MINOR_VERSION 0)
set(breakhack_PATCH_VERSION 2)
set(breakhack_PATCH_VERSION 3)
set(breakhack_RELEASE_TYPE "")
include(FindLua)

View File

@ -0,0 +1,2 @@
8ab527c Makes monsters fall when the tile they are on falls
8e39ff8 Fix releasenotes for v2.0.2