summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-08-16 07:11:25 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-08-16 07:11:50 +0300
commit3288b23502c195d03e097cb372a22f3a1ac4ba87 (patch)
tree5b046b4c0ef2dd61f1c5226e2276d48c268a1c00
parent317f3f15fed855cfaa31a9b558bf1279583832e6 (diff)
Merge develop to master
+ a dummy change to allow committing Change-Id: I0315a36bc5f3a5f52957addb5846dbd92613fbb9 Change-Id: I0315a36bc5f3a5f52957addb5846dbd92613fbb9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--README1
1 files changed, 1 insertions, 0 deletions
diff --git a/README b/README
index e69de29b..f818b631 100644
--- a/README
+++ b/README
@@ -0,0 +1 @@
+Merging develop to master (this is a dummy change) \ No newline at end of file