Skip to content

Commit

Permalink
Merge befc2f8 into 5fb7369
Browse files Browse the repository at this point in the history
  • Loading branch information
uglide committed Oct 9, 2018
2 parents 5fb7369 + befc2f8 commit 51245a6
Show file tree
Hide file tree
Showing 68 changed files with 3,824 additions and 3,975 deletions.
4 changes: 0 additions & 4 deletions 3rdparty/3rdparty.pri
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnseria
# qredisclient
include($$PWD/qredisclient/qredisclient.pri)

# Easylogging
INCLUDEPATH += $$PWD/easyloggingpp/src
HEADERS += $$PWD/easyloggingpp/src/easylogging++.h

# Asyncfuture
include($$PWD/asyncfuture/asyncfuture.pri)

Expand Down
Loading

0 comments on commit 51245a6

Please sign in to comment.