summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Collapse)AuthorAgeFilesLines
...
* | modelviews/stringlistmodel example modificationsartoka2011-11-173-19/+43
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/pathview example modificationsartoka2011-11-1714-436/+6
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/parallax example modificationsartoka2011-11-1717-8/+214
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/package example modificationsartoka2011-11-1710-3/+209
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelview/objectlistmodel example modificationsartoka2011-11-174-26/+44
| | | | | | | | | | | | | | | | Modified example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Modelview examples modifications.artoka2011-11-17151-3309/+43
| | | | | | | | | | | | | | | | | | | | | | | | modelviews\listview dynamiclist, expandingdelegates, highlight, hightlightranges and sections example modifications Modified the examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/gridview-example example modificationsartoka2011-11-1714-436/+6
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, deleted duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/delegate example modificationsartoka2011-11-178-437/+7
| | | | | | | | | | | | | | | | | | Modified the project to use centralized qmlapplicationviewer, deleted duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | modelviews/abstractitemmodel example modificationsartoka2011-11-173-10/+41
| | | | | | | | | | | | | | | | | | Modified the project to use centralized qmlapplicationviewer, deleted duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | keyintegration example modificationsartoka2011-11-1718-909/+8
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | imageelements/borderimage, image and shadows example modificationsartoka2011-11-1745-1739/+18
| | | | | | | | | | | | | | | | | | Modified the examples to use centralized qmlapplicationviewer, removed duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | i18n example modificationsartoka2011-11-178-514/+6
| | | | | | | | | | | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | cppextensions/qgraphicslayouts examples modificationsartoka2011-11-178-29/+120
| | | | | | | | | | | | | | | | Modified projects to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | cppextensions/networkaccessmanagerfactory modificationsartoka2011-11-175-24/+52
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | animations/states example modificationsartoka2011-11-1711-667/+6
| | | | | | | | | | | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | animation/easing example modificationsartoka2011-11-1710-488/+6
| | | | | | | | | | | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | behaviors/behavior-example modificationsartoka2011-11-1713-740/+6
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Basics example cleanupartoka2011-11-173-231/+0
| | | | | | | | | | | | | | Removed duplicated files from basics examples Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | basics/property-animation modificationsartoka2011-11-1713-546/+6
| | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Basics/color-animation modificationsartoka2011-11-1713-541/+8
|/ | | | | | | | Example was modified to use centralized qmlapplicationviewer, duplicate files were removed, and project files updated. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
| | | | Reviewed-by: Donald Carr
* Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2766-1133/+1133
| | | | | | New files after previous license change round. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2435-0/+1448
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+11
| |\
| * | Qmlshadersplugin examples added.Marko Niemelä2011-06-1335-0/+1448
| | | | | | | | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
* | | Added missing license headers.David Boddie2011-06-173-0/+120
| | |
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-173-3/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-1/+11
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-271-1/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
| * | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-241-0/+18
| |\ \
| * | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-19033
* | | | Added missing license headers.David Boddie2011-06-153-0/+120
| | | |
* | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-08144-0/+5760
| | | |
* | | | Merge branch '4.8'David Boddie2011-05-132-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/whatsnew.qdoc doc/src/examples/orientation.qdoc doc/src/examples/webftpclient.qdoc examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg src/corelib/global/qglobal.cpp src/gui/text/qglyphs.cpp src/gui/text/qplatformfontdatabase_qpa.cpp
| * | | | Doc: Added missing project and desktop files.David Boddie2011-05-1114-0/+224
| | | | |
| * | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-11963-0/+50211
| | | | |
| * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-04139-2031/+4
| | |/ / | |/| | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | | Squashed merge of the master-temp branch.David Boddie2011-05-0616-0/+279
| | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/maemovibration.qdoc
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-061-0/+18
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-031-0/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+18
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+18
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add pincharea.qmlproject file for PinchArea example. Moving contentY by large values in List/GridView is slow
| | | | * Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
| | | * | Fixed license headers for examples in 4.7Timo Turunen2011-04-056-162/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-04-282-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/animation/basics/color-animation/qml/basics.qmlproject examples/declarative/animation/basics/property-animation/qml/basics.qmlproject examples/declarative/animation/basics/property-animation/qml/images/face-smile.png examples/declarative/animation/basics/property-animation/qml/images/moon.png examples/declarative/animation/basics/property-animation/qml/images/shadow.png examples/declarative/animation/basics/property-animation/qml/images/star.png examples/declarative/animation/basics/property-animation/qml/images/sun.png examples/declarative/animation/behaviors/behavior-example/qml/behaviors.qmlproject examples/declarative/animation/easing/qml/easing.qmlproject examples/declarative/animation/states/qml/qt-logo.png examples/declarative/animation/states/qml/states.qmlproject examples/declarative/demos/calculator/qml/calculator.qmlproject examples/declarative/demos/samegame/qml/samegame.qmlproject examples/declarative/demos/webbrowser/qml/webbrowser.qmlproject examples/declarative/i18n/qml/i18n.qmlproject examples/declarative/i18n/qml/i18n/base.ts examples/declarative/i18n/qml/i18n/qml_en_AU.qm examples/declarative/i18n/qml/i18n/qml_en_AU.ts examples/declarative/i18n/qml/i18n/qml_fr.qm examples/declarative/i18n/qml/i18n/qml_fr.ts examples/declarative/imageelements/image/qml/image.qmlproject examples/declarative/imageelements/image/qml/qt-logo.png examples/declarative/imageelements/shadows/qml/borderimage.qmlproject examples/declarative/imageelements/shadows/qml/content/bw.png examples/declarative/imageelements/shadows/qml/content/colors-round.sci examples/declarative/imageelements/shadows/qml/content/colors-stretch.sci examples/declarative/imageelements/shadows/qml/content/colors.png examples/declarative/imageelements/shadows/qml/content/shadow.png examples/declarative/keyinteraction/focus/qml/Core/images/arrow.png examples/declarative/keyinteraction/focus/qml/Core/images/qt-logo.png examples/declarative/keyinteraction/focus/qml/focus.qmlproject examples/declarative/modelviews/Delegate/qml/package.qmlproject examples/declarative/modelviews/gridview-example/qml/gridview.qmlproject examples/declarative/modelviews/gridview-example/qml/pics/AddressBook_48.png examples/declarative/modelviews/gridview-example/qml/pics/AudioPlayer_48.png examples/declarative/modelviews/gridview-example/qml/pics/Camera_48.png examples/declarative/modelviews/gridview-example/qml/pics/DateBook_48.png examples/declarative/modelviews/gridview-example/qml/pics/EMail_48.png examples/declarative/modelviews/gridview-example/qml/pics/TodoList_48.png examples/declarative/modelviews/gridview-example/qml/pics/VideoPlayer_48.png examples/declarative/modelviews/listview/sections/qml/content/pics/fruit-salad.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/hamburger.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/lemonade.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/moreDown.png examples/declarative/modelviews/listview/sections/qml/content/pics/moreUp.png examples/declarative/modelviews/listview/sections/qml/content/pics/pancakes.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/vegetable-soup.jpg examples/declarative/modelviews/listview/sections/qml/listview.qmlproject examples/declarative/modelviews/pathview-example/qml/pathview.qmlproject examples/declarative/modelviews/pathview-example/qml/pics/AddressBook_48.png examples/declarative/modelviews/pathview-example/qml/pics/AudioPlayer_48.png examples/declarative/modelviews/pathview-example/qml/pics/Camera_48.png examples/declarative/modelviews/pathview-example/qml/pics/DateBook_48.png examples/declarative/modelviews/pathview-example/qml/pics/EMail_48.png examples/declarative/modelviews/pathview-example/qml/pics/TodoList_48.png examples/declarative/modelviews/pathview-example/qml/pics/VideoPlayer_48.png examples/declarative/modelviews/visualitemmodel/qml/visualitemmodel.qmlproject examples/declarative/modelviews/webview/autosize/qml/webview.qmlproject examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html examples/declarative/modelviews/webview/newwindows/qml/webview.qmlproject examples/declarative/positioners/qml/add.png examples/declarative/positioners/qml/del.png examples/declarative/positioners/qml/positioners.qmlproject examples/declarative/text/fonts/banner/qml/fonts.qmlproject examples/declarative/text/fonts/hello/qml/fonts.qmlproject examples/declarative/text/fonts/hello/qml/fonts/tarzeau_ocr_a.ttf examples/declarative/text/textselection/qml/pics/endHandle.png examples/declarative/text/textselection/qml/pics/endHandle.sci examples/declarative/text/textselection/qml/pics/startHandle.png examples/declarative/text/textselection/qml/pics/startHandle.sci examples/declarative/text/textselection/qml/textselection.qmlproject examples/declarative/touchinteraction/gestures/experimental-gestures/qml/gestures.qmlproject examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea.qmlproject examples/declarative/toys/clocks/qml/clocks.qmlproject examples/declarative/toys/clocks/qml/content/quit.png examples/declarative/toys/corkboards/qml/cork.jpg examples/declarative/toys/corkboards/qml/corkboards.qmlproject examples/declarative/toys/corkboards/qml/note-yellow.png examples/declarative/toys/corkboards/qml/tack.png examples/declarative/toys/dynamicscene/qml/dynamicscene.qmlproject examples/declarative/toys/dynamicscene/qml/images/NOTE examples/declarative/toys/dynamicscene/qml/images/face-smile.png examples/declarative/toys/dynamicscene/qml/images/moon.png examples/declarative/toys/dynamicscene/qml/images/rabbit_brown.png examples/declarative/toys/dynamicscene/qml/images/rabbit_bw.png examples/declarative/toys/dynamicscene/qml/images/star.png examples/declarative/toys/dynamicscene/qml/images/sun.png examples/declarative/toys/dynamicscene/qml/images/tree_s.png examples/declarative/toys/dynamicscene/qml/qml/itemCreation.js examples/declarative/toys/tic-tac-toe/qml/content/pics/board.png examples/declarative/toys/tic-tac-toe/qml/content/pics/o.png examples/declarative/toys/tic-tac-toe/qml/content/pics/x.png examples/declarative/toys/tic-tac-toe/qml/content/tic-tac-toe.js examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe.qmlproject examples/declarative/toys/tvtennis/qml/tvtennis.qmlproject examples/declarative/ui-components/dialcontrol/qml/content/background.png examples/declarative/ui-components/dialcontrol/qml/content/needle.png examples/declarative/ui-components/dialcontrol/qml/content/needle_shadow.png examples/declarative/ui-components/dialcontrol/qml/content/overlay.png examples/declarative/ui-components/dialcontrol/qml/content/quit.png examples/declarative/ui-components/dialcontrol/qml/dialcontrol.qmlproject examples/declarative/ui-components/flipable/qml/content/5_heart.png examples/declarative/ui-components/flipable/qml/content/9_club.png examples/declarative/ui-components/flipable/qml/content/back.png examples/declarative/ui-components/flipable/qml/flipable.qmlproject examples/declarative/ui-components/main/qml/content/spinner-bg.png examples/declarative/ui-components/main/qml/content/spinner-select.png examples/declarative/ui-components/main/qml/images/clear.png examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png examples/declarative/ui-components/main/qml/images/lineedit-bg.png examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg examples/declarative/ui-components/main/qml/progressbar.qmlproject examples/declarative/ui-components/main/qml/scrollbar.qmlproject examples/declarative/ui-components/main/qml/searchbox.qmlproject examples/declarative/ui-components/main/qml/spinner.qmlproject examples/declarative/ui-components/main/qml/tab.png examples/declarative/ui-components/main/qml/tabwidget.qmlproject examples/declarative/ui-components/progressbar/qml/content/background.png examples/declarative/ui-components/progressbar/qml/progressbar.qmlproject examples/declarative/ui-components/slideswitch/qml/content/background.svg examples/declarative/ui-components/slideswitch/qml/content/knob.svg examples/declarative/ui-components/slideswitch/qml/slideswitch.qmlproject examples/declarative/xml/xmlhttprequest-example/qml/data.xml examples/declarative/xml/xmlhttprequest-example/qml/xmlhttprequest.qmlproject
| * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-27139-2031/+4
| |/ / / | | | | | | | | | | | | (4.7-generated-declarative branch).
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-28969-76/+48201
|/ / / | | | | | | | | | (4.7-generated-declarative branch).
* | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-073-3/+3
|\ \ \
| * \ \ Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-2412-8/+1142
| |\ \ \
| * | | | Update copyright year to 2011.Jason McDonald2011-01-10237-237/+237
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me