summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2689-0/+2345
|\
| * Merge branch '4.5'Thiago Macieira2009-05-221-0/+0
| |\
| | * Doc - updating the screenshotKavindra Devi Palaraja2009-05-221-0/+0
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-2247-173/+977
| |\ \
| * | | Doc: Added a small example/test case for sequential animations.David Boddie2009-05-207-0/+108
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-193-3/+357
| |\ \ \
| | * | | Fixed access to members of an object.David Boddie2009-05-181-2/+2
| | * | | Doc: Added architecture image to animation overview.Geir Vattekar2009-05-152-1/+4
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-151-0/+2
| | |\ \ \
| | * | | | Doc: Added a work in progress class hierarchy overview.David Boddie2009-05-151-0/+351
| * | | | | doc: Minor fixes + update UML diagrams for stick man exampleEskil Abrahamsen Blomfeldt2009-05-185-4/+10
| * | | | | doc: New state chart diagrams for Stickman exampleEskil Abrahamsen Blomfeldt2009-05-153-0/+0
| * | | | | Remove the connectByAnimation() function and add some documentation for the S...Eskil Abrahamsen Blomfeldt2009-05-143-0/+115
| | |/ / / | |/| | |
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-142-9/+9
| |\ \ \ \ | | |/ / /
| | * | | Doc: Marked up a link correctly.David Boddie2009-05-141-1/+1
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-137-5/+259
| | |\ \ \
| | * \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-1248-388/+1003
| | |\ \ \ \
| | * | | | | Merged local changes.David Boddie2009-04-292-8/+8
| * | | | | | Pop up message when a tank wins the gameEskil Abrahamsen Blomfeldt2009-05-141-0/+2
| | |_|/ / / | |/| | | |
| * | | | | more statemachine docsKent Hansen2009-05-132-5/+40
| * | | | | doc: Add screenshot for Tank Game ExampleEskil Abrahamsen Blomfeldt2009-05-131-0/+0
| * | | | | document statemachine/factorial exampleKent Hansen2009-05-133-0/+103
| * | | | | doc: Correct names of snippets in docs for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-131-1/+1
| * | | | | doc: Add documentation for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-0/+116
| | |/ / / | |/| | |
| * | | | document the statemachine/eventtransitions exampleKent Hansen2009-05-122-2/+89
| * | | | add State Machine to examples overviewKent Hansen2009-05-121-0/+8
| * | | | Fixes: document statemachine/twowaybutton exampleKent Hansen2009-05-122-0/+83
| * | | | document the statemachine/pingpong exampleKent Hansen2009-05-123-0/+108
| * | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-1211-56/+435
| |\ \ \ \
| | * | | | doc: Add documentation for animations, restore policy and polished signalEskil Abrahamsen Blomfeldt2009-05-121-0/+182
| | * | | | update license headersKent Hansen2009-05-122-6/+66
| | * | | | improve the docs for the trafficlight exampleKent Hansen2009-05-123-16/+27
| | * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-121-0/+1
| | |\ \ \ \
| | | * | | | Doc: Assign state machine overview to architecture group (get it inGeir Vattekar2009-05-111-0/+1
| | | |/ / /
| | * | | | redo statecharts in proper UML notation, expand documentationKent Hansen2009-05-128-22/+150
| | |/ / /
| | * | | replace QState::Type with QState::childMode propertyKent Hansen2009-04-291-6/+5
| | * | | move assignProperty() to QStateKent Hansen2009-04-291-5/+4
| | * | | kill the stateactions apiKent Hansen2009-04-221-4/+3
| | * | | more docKent Hansen2009-04-171-6/+6
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1754-479/+1319
| | |\ \ \
| | * | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-173292-0/+227236
| | / / /
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1279-821/+1608
| |\ \ \ \
| * | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-173292-0/+227236
| / / / /
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-225-60/+355
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Sync the French addressbook tutorial with the English versionBenjamin Poulain2009-05-201-2/+5
| * | | | Changing the addressbook tutorial so it doesn't leak.Daniel Molkentin2009-05-201-3/+6
| * | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-55/+344
| |\ \ \ \
| | * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-202-1/+262
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-201-1/+1
| | | |\ \ \
| | | | * | | Fix incorrect copyright year in some license headers.Jason McDonald2009-05-201-1/+1