Skip to content

Commit

Permalink
Merge branch 'master' into release/v3.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiohs84
sergiohs84 committed Jul 3, 2017
2 parents 405f56b + 1936f4a commit 0a9fd82
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions contrib/QtCreator/megacli.files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@
../../tests/crypto_test.cpp
../../src/thread/libuvthread.cpp
../../include/mega/thread/libuvthread.h
../../include/mega/version.h

0 comments on commit 0a9fd82

Please sign in to comment.