diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-18 14:20:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-18 14:20:58 +0200 |
| commit | cbf4de03153a6729db6edcf244a282d901dd1c03 (patch) | |
| tree | 81792056743630c19b384fd28f4ab9b1c665d970 /src/plugins/cppeditor/cppincludehierarchy.cpp | |
| parent | 6cee8a42ff1b56f35143e6011d70747913710091 (diff) | |
| parent | e3979fe09d7dd3ef1546e97d22d76178c8e38303 (diff) | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
tests/auto/debugger/tst_dumpers.cpp
Change-Id: I1bad0c1477d7fd6996c0f8ca82e76ba521bc0dcc
Diffstat (limited to 'src/plugins/cppeditor/cppincludehierarchy.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppincludehierarchy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp index c19bd009f3..be5457736b 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.cpp +++ b/src/plugins/cppeditor/cppincludehierarchy.cpp @@ -51,7 +51,7 @@ #include <QVBoxLayout> using namespace CppEditor; -using namespace Internal; +using namespace CppEditor::Internal; using namespace Utils; namespace CppEditor { |