mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
90103e7de5
|
@ -20,6 +20,9 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Changelog:
|
# Changelog:
|
||||||
|
# 1.5: 12 May 2024
|
||||||
|
# "dr-freedata-001" branch of codec2 merged to main so we don't
|
||||||
|
# need to checkout that branch specifically
|
||||||
# 1.4: 05 May 2024
|
# 1.4: 05 May 2024
|
||||||
# Change to "dr-freedata-001" branch of codec2 for develop mode
|
# Change to "dr-freedata-001" branch of codec2 for develop mode
|
||||||
# Added comments in scripts and README.txt for config file location
|
# Added comments in scripts and README.txt for config file location
|
||||||
|
@ -296,10 +299,11 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$args" == "develop" ];
|
# Not currently needed
|
||||||
then
|
# if [ "$args" == "develop" ];
|
||||||
git checkout dr-freedata-001
|
# then
|
||||||
fi
|
# git checkout dr-freedata-001
|
||||||
|
# fi
|
||||||
|
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
echo "Setting up the codec2 build"
|
echo "Setting up the codec2 build"
|
||||||
|
|
Loading…
Reference in a new issue