Revert from feature/release_3.24.6.1 to master following blp merge

Rblp · Sep 6, 2024 · 318b153 · 318b153
1 parent 7a8dd50
commit 318b153
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/configure b/configure
@@ -83,8 +83,7 @@ download() {
 ## respects enviroment variable so 'blpHeaders="/opt/blp/blpHeaders_1.2.3.tar.gz" ./configure' works
 : ${blpHeaders="blpHeaders.tar.gz"}
 : ${blpLibrary="blpLibrary.tar.gz"}
-#: ${blpBranch="master"}
-: ${blpBranch="feature/release_3.24.6.1"}
+: ${blpBranch="master"}
 
 ## Check for header files and download if needed, this looks at repo blp in directory headers/
 cwd=$(pwd)

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -40,8 +40,7 @@ all:    	blpLibrary $(SHLIB)
 ## the opening '@' ensures operations are executed 'quietly'
 ## in order to see commands as they happens add a 'v' to the tar and cp commands
 ## curl has '-k' flag to suppress certificate warnings
-#BRANCH = "master"
-BRANCH = "feature/release_3.24.6.1"
+BRANCH = "master"
 blpLibrary:
 		@if [ ! -d ../inst ]; then mkdir -p ../inst; fi
 		@if [ ! -d ../blp/win/${FLV} ]; then mkdir -p ../blp/win/${FLV}; fi