qt/qtdeclarative.git - Qt Declarative (Quick 2)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into qtquick2	Aaron Kennedy	2011-06-09	87	-119/+4523
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/declarative/qml/qdeclarativeengine.cpp
\| *	Doc: Added missing license headers for documentation and examples.	David Boddie	2011-06-08	15	-0/+600
\| \|
\| *	Removed generated files.	David Boddie	2011-06-08	9	-144/+0
\| \|
\| *	Doc: Added missing project and desktop files.	David Boddie	2011-05-23	4	-0/+64
\| \|
\| *	Squashed commit of changes from the 4.8-temp branch.	David Boddie	2011-05-23	89	-0/+4957
\| \|
\| *	Squashed commit of the changes from the mobile-examples repository	David Boddie	2011-05-23	28	-1073/+0
\| \| \| \| \| \| \| \| \| \|	(4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* \|	Immense Particles Refactor Part D	Alan Alpert	2011-06-08	2	-3/+3
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the names of several properties: FollowEmitter: emissionShape->emitShape emissionHeight->emitHeight emissionWidth->emitWidth Emitter: particlesPerSecond->emitRate particleDuration->lifeSpan particleDurationVariation->lifeSpanVariation maxParticles->emitCap particleSize->size particleEndSize->endSize particleSizeVariation->sizeVariation ImageParticle: image->source And stopped being silly in the example launcher.
*	Initial import from the monolithic Qt.	Qt by Nokia	2011-04-27	45	-0/+2436
	This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12