diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-16 07:14:35 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-16 07:14:35 +0300 |
commit | 6c0334496d50aaf4e11dcda7ed642fac565d6145 (patch) | |
tree | aa6e7aeef9b00ba46910c30bd85fedbc53df39a0 /src/src.pro | |
parent | 3288b23502c195d03e097cb372a22f3a1ac4ba87 (diff) | |
parent | 29f6433606cebe3299e9915ae32bae7dfaed2770 (diff) |
Merge remote-tracking branch 'origin/develop'
Change-Id: I544af544ecd946cdcccfe9c17d03e47f8d0c1151
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index d25722eb..171f9fde 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += datavis3d \ - datavis3dqml2 + datavis3dqml2 |