Merge branch 'master' into dev

This commit is contained in:
Debao Zhang
2013-12-31 14:00:55 +08:00
2 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -37,7 +37,7 @@
// We mean it.
//
#include "xlsxConditionalFormatting.h"
#include "xlsxconditionalformatting.h"
#include "xlsxformat.h"
#include "xlsxcolor_p.h"
#include <QSharedData>