diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-06-21 12:03:07 +1000 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2011-06-21 12:03:07 +1000 |
| commit | 222b1e0784b0cdfe2933235a62823c5342618f14 (patch) | |
| tree | 4a6679327b176150f2b4be64535dc5a5b4ec3c28 /src/declarative/items/qsgimplicitsizeitem.cpp | |
| parent | f0ab52c313076fce7e854fd494b88c5dd0f71af5 (diff) | |
| parent | 0990f073953a499b1413b049c1909d09fec5a815 (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Diffstat (limited to 'src/declarative/items/qsgimplicitsizeitem.cpp')
| -rw-r--r-- | src/declarative/items/qsgimplicitsizeitem.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qsgimplicitsizeitem.cpp index f2cc9bcbdb..f8e5b5f021 100644 --- a/src/declarative/items/qsgimplicitsizeitem.cpp +++ b/src/declarative/items/qsgimplicitsizeitem.cpp @@ -1,4 +1,3 @@ -// Commit: 6f78a6080b84cc3ef96b73a4ff58d1b5a72f08f4 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). |