Skip to content

Commit

Permalink
Merge branch 'master' into 680
Browse files Browse the repository at this point in the history
  • Loading branch information
xkevin168 committed Jan 6, 2019
2 parents c116f15 + 399a37c commit c623fd5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ link_directories("${LEVIATHAN_SRC}/build/bin")
set(PROGRAM_VERSION_STABLE 0)
set(PROGRAM_VERSION_MAJOR 4)
set(PROGRAM_VERSION_MINOR 0)
set(PROGRAM_VERSION_PATCH 1)
set(PROGRAM_VERSION_PATCH 2)
set(PROGRAM_VERSION_SUFFIX "")

set(PROGRAM_VERSION_STR ${PROGRAM_VERSION_STABLE}.${PROGRAM_VERSION_MAJOR}.${PROGRAM_VERSION_MINOR}.${PROGRAM_VERSION_PATCH}${PROGRAM_VERSION_SUFFIX})
Expand Down
2 changes: 1 addition & 1 deletion SetupThrive.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def parseExtraArgs
leviathan = Leviathan.new(
# Use this if you always want the latest commit
# version: "develop",
version: "19d0cea98a62989681127936c47867bae71cb94c",
version: "55f85074961175d8ffecfca2e318eb093b2d9c68",
# Doesn't actually work, but leviathan doesn't install with sudo by
# default, or install at all for that matter
noInstallSudo: true
Expand Down

0 comments on commit c623fd5

Please sign in to comment.