summaryrefslogtreecommitdiffstats
path: root/tests/option.file2
blob: f1d020a89a19abe70c4a46d2ccadf78d70a05b8a (plain)
1
2
*foo1: magenta
foo2 missing colon
lumn5'>| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-124-0/+120 | | | | |\ \ | | | | | * | Fix compile error with QT_NO_ACTION in QtGuiTasuku Suzuki2010-04-121-0/+12 | | | | | * | Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-123-37/+9 | | | | | |\ \ | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-04-1211-102/+201 | | | | | |\ \ \ | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-10