diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-22 10:23:08 -0500 |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-22 10:23:08 -0500 |
commit | fb6f2025dc3acae028a11452ee6fe97164219395 (patch) | |
tree | 1ab65bc96d97103b9687d3e7aec530e29e4abaa6 /patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch | |
parent | 8b675f072001837b0b33c7130a76536fdaee084c (diff) |
Rebase ontop of latest master
Diffstat (limited to 'patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch')
-rw-r--r-- | patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch index 2fe8a2e..25536a0 100644 --- a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch +++ b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch @@ -1,7 +1,8 @@ -From 3508e33061e9decbb53cdc98a03d781f30877e04 Mon Sep 17 00:00:00 2001 +From fb1f2fa3e375382df16d1e9c8b5137ddad3e96e5 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Tue, 22 Mar 2011 09:19:46 +0100 -Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a global test. +Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a + global test. --- .../auto/maketestselftest/tst_maketestselftest.cpp | 3 ++- @@ -22,5 +23,5 @@ index 8ed8cb8..9fbfd5a 100644 continue; } -- -1.7.3.4 +1.7.5.rc2.4.g4d8b3 |