diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
| commit | 01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch) | |
| tree | b3c421716c3bc6892b565a096a8ec5be837cd267 /.tag | |
| parent | 16f58282bc5a1f81f7346ac6560df68761ad277d (diff) | |
| parent | dbbcc4dff099d5cf41a3253f922b785889e17545 (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
Diffstat (limited to '.tag')
| -rw-r--r-- | .tag | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -0,0 +1 @@ +$Id$ |