Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/christophhart/HISE into …
Browse files Browse the repository at this point in the history
…develop

# Conflicts:
#	hi_tools/hi_neural/onnx_loader.h
  • Loading branch information
Christoph Hart committed Nov 7, 2024
2 parents 081d945 + 30ce85b commit 56eb7f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion currentGitHash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
776880d9795370ce319abb2971bfdd63cb72fae6
8448dfb1de3d35b54e3738b7663f60ea454ba729
2 changes: 1 addition & 1 deletion hi_backend/backend/currentGit.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define PREVIOUS_HISE_COMMIT "776880d9795370ce319abb2971bfdd63cb72fae6"
#define PREVIOUS_HISE_COMMIT "8448dfb1de3d35b54e3738b7663f60ea454ba729"
2 changes: 1 addition & 1 deletion projects/standalone/JuceLibraryCode/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#define JUCE_USE_DARK_SPLASH_SCREEN 1

#define JUCE_PROJUCER_VERSION 0x60103
#define JUCE_PROJUCER_VERSION 0x60104

//==============================================================================
#define JUCE_MODULE_AVAILABLE_hi_backend 1
Expand Down

0 comments on commit 56eb7f9

Please sign in to comment.