diff options
author | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-07-02 14:05:34 +0300 |
---|---|---|
committer | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-07-02 14:05:34 +0300 |
commit | a15140bc99bb2bda6b4947208ec467f99dc1c545 (patch) | |
tree | 1523846550494809b9c43508ec736786331871b7 /.gitignore | |
parent | f2c78ba263cf77ff9a44ab2a3b330be439501352 (diff) | |
parent | 5a13bccf0b5a80772bf77c2c67f8df9f617cc8aa (diff) |
Merge branch 'master' into bugfix_126195
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -39,7 +39,3 @@ lcov.info INSTALL build-stamp flexi-properties.xml -/libcontextsubscriber/multithreading-tests/new-property-in-thread/new-property-in-thread -/libcontextsubscriber/multithreading-tests/old-property-in-thread/old-property-in-thread -/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/wait-for-subscription-thread -/libcontextsubscriber/multithreading-tests/single-thread/single-thread |