Merge branch 'dev' into open-config-in-app
This commit is contained in:
commit
9f7b2de311
22 changed files with 96 additions and 66 deletions
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include "QZXing.h"
|
||||
|
||||
#include "platforms/ios/QRCodeReader.h"
|
||||
#include "platforms/ios/QRCodeReaderBase.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "defines.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue