Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

bbf4acf4 · ck · 440dbebf · 11dca3f1 · bbf4acf4
Commit bbf4acf4 authored Jun 23, 2010 by ck
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/libs/cplusplus/TokenCache.h src/libs/cplusplus/TokenCache.h +2 -1

No files found.
--- a/src/libs/cplusplus/TokenCache.h
+++ b/src/libs/cplusplus/TokenCache.h
 #ifndef TOKENCACHE_H
 #define TOKENCACHE_H

+#include "SimpleLexer.h"
+
 #include <CPlusPlusForwardDeclarations.h>
-#include <SimpleLexer.h>

 #include <QtCore/QHash>
 #include <QtCore/QList>