diff options
| author | Alex <qt-info@nokia.com> | 2009-10-28 14:04:30 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-10-28 14:04:30 +1000 |
| commit | 4aa6c95637dd3d92bfead0940a2927a26c8788b6 (patch) | |
| tree | 6ad4a37950e260e323a7d7bbfaa45399f95a51b6 /bin | |
| parent | de760dbb9d3c0b56475fccb5074e901eaaeb736d (diff) | |
| parent | fc70c0374f68052bca1942936887f57433888be1 (diff) | |
Merge branch 'master' of ../systeminfo
Conflicts:
bin/rununittests.bat
doc/html/systeminformation-library.dcf
doc/html/systeminformation-library.index
doc/src/index.qdoc
systeminfo/qsysteminfo_win.cpp
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 79fb0f5fd0..952e1d5186 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -1,3 +1,4 @@ +<<<<<<< HEAD:bin/rununittests.bat ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). @@ -83,9 +84,9 @@ tst_qcrmlparser.exe tst_qsystemdeviceinfo.exe tst_qsystemdisplayinfo.exe tst_qsysteminfo.exe -tst_qsystemmemoryinfo.exe tst_qsystemnetworkinfo.exe tst_qsystemscreensaver.exe +tst_qsystemstorageinfo.exe cd %SAVED_PWD% |