diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
| commit | 9923c171853b2f8b4a3a6b096d263fa6cf461a0b (patch) | |
| tree | 38ea3966fcd11725c7d3c1606be637a000c233fd /tests/auto/linguist/lconvert/.gitignore | |
| parent | bc83b5856416e5927822ee3e758d231fc9f43c38 (diff) | |
| parent | 8dbc32699dec7aa928eb9518c05437f481d11a43 (diff) | |
| download | Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.zip Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.gz Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.bz2 | |
merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'tests/auto/linguist/lconvert/.gitignore')
| -rw-r--r-- | tests/auto/linguist/lconvert/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/linguist/lconvert/.gitignore b/tests/auto/linguist/lconvert/.gitignore new file mode 100644 index 0000000..042d7ac --- /dev/null +++ b/tests/auto/linguist/lconvert/.gitignore @@ -0,0 +1,2 @@ +tst_lconvert +data/plural-?.po |