diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
| commit | a9ac6da893ac10ce160c9eb80141508881cd71e2 (patch) | |
| tree | 0e74067407612d44ad07ff74cb7be6d444ee28c5 /src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch | |
| parent | 8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff) | |
| parent | 687461627310e8b781da15d1a907c35bd8ffea6e (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
Diffstat (limited to 'src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch')
| -rw-r--r-- | src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch b/src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch index f73785d123..24ff160675 100644 --- a/src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch +++ b/src/v8/0013-Remove-execute-flag-from-v8-debug.h.patch @@ -1,7 +1,7 @@ -From dc2cad4f8fc88c52fcea09b8d0262d35cd32dc44 Mon Sep 17 00:00:00 2001 +From c36be227e9d7952a1952caa529c78ecdc376bd55 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Thu, 25 Aug 2011 11:09:58 +1000 -Subject: [PATCH 13/16] Remove execute flag from v8-debug.h +Subject: [PATCH 13/15] Remove execute flag from v8-debug.h --- 0 files changed, 0 insertions(+), 0 deletions(-) @@ -10,6 +10,6 @@ Subject: [PATCH 13/16] Remove execute flag from v8-debug.h diff --git a/include/v8-debug.h b/include/v8-debug.h old mode 100755 new mode 100644 --- -1.7.6 +-- +1.7.4.4 |