From: Chris Koeritz Date: Sat, 11 Nov 2017 05:56:30 +0000 (-0500) Subject: Merge branch 'release-2.140.94' X-Git-Tag: 2.140.94^0 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e5eb2d2f1fa726079af1111cc544b23d8ca567cf;hp=a3eb81d9750ce39f40338d9f8f14e67d94e8c166;p=feisty_meow.git Merge branch 'release-2.140.94' merging in the new release branch --- diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index 6415cf1e..eab520cc 100644 --- a/production/feisty_meow_config.ini +++ b/production/feisty_meow_config.ini @@ -3,7 +3,7 @@ # specifies the version of the code that is being constructed here. major=2 minor=140 -revision=92 +revision=94 build=420 # specifies the remainder of the version record info. diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 80226899..c5a6fd36 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -34,7 +34,7 @@ if [ ! -d "$FEISTY_MEOW_SCRIPTS" -o ! -d "$FEISTY_MEOW_APEX" ]; then if [ -d "$FEISTY_MEOW_GENERATED_STORE" ]; then \rm -rf "$FEISTY_MEOW_GENERATED_STORE"; fi # also wipe any values from the variables pointing at generated stuff. unset FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_GENERATED_STORE - exec "$*" + exec $* fi ##############