diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 11:51:43 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 11:51:43 (GMT) |
| commit | 28be44a363468f1d3cf0a041c3daf88893820edd (patch) | |
| tree | 00f59c1c6e7aa60bd92ed2aa597871551a88d7d2 /src/3rdparty | |
| parent | 849e46599f0751ba5994d036df140d10e76e223c (diff) | |
| parent | bdf7020103bc9698584005935f00cd874f841a49 (diff) | |
| download | Qt-28be44a363468f1d3cf0a041c3daf88893820edd.zip Qt-28be44a363468f1d3cf0a041c3daf88893820edd.tar.gz Qt-28be44a363468f1d3cf0a041c3daf88893820edd.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp index 05e3d7b..f7bda9e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp @@ -46,7 +46,6 @@ #define DO_PROPERTYMAP_CONSTENCY_CHECK 0 #endif -using namespace std; using namespace WTF; namespace JSC { |