Commit 64ac6260 authored by Leander Schulten's avatar Leander Schulten
Browse files

Remove stash error strings

parent 1946ba45
......@@ -97,19 +97,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
DISTFILES +=
<<<<<<< Updated upstream
=======
# QMAKE_CXXFLAGS += -fsanitize=address
# QMAKE_CXXFLAGS += -fno-omit-frame-pointer
# QMAKE_CXXFLAGS += -Wshadow
# QMAKE_CXXFLAGS += -lasan
# LIBS += -lasan
win32-msvc{
LIBS += -L$$PWD/lib/boost/
}
>>>>>>> Stashed changes
win32-g++{
#AudioFFT
LIBS += -L$$PWD/'lib/AudioFFT/dll' -lAudioFFT
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment