[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks
From:       David Faure <faure+bluesystems () kde ! org>
Date:       2013-04-08 22:00:26
Message-ID: 20130408220026.44754A605D () git ! kde ! org
[Download RAW message or body]

Git commit 01d4b9d084d76ff479453a972325a08bf381b55d by David Faure.
Committed on 08/04/2013 at 23:43.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	interfaces/ktexteditor/view.h [deleted]
	kde3support/kdeui/k3sconfig.cpp [deleted]
	kdecore/io/ksavefile.cpp [moved; new feature merged]
	khtml/CMakeLists.txt [debugger made optional]
	kio/kio/kfileitem.cpp [qmimetype vs delayed loading]
	kio/tests/kfileitemtest.cpp [same]
	staging/kde4support/autotests/ksavefiletest.cpp [new feature]
	staging/kde4support/src/kdecore/ksavefile.h [new feature vs splitup]

M  +1    -0    kdeui/widgets/kactionselector.cpp
M  +4    -1    khtml/CMakeLists.txt
M  +6    -280  khtml/ecma/kjs_audio.cpp
M  +1    -1    khtml/ecma/kjs_binding.h
M  +49   -21   khtml/ecma/kjs_context2d.cpp
M  +14   -0    khtml/ecma/kjs_html.cpp
M  +214  -1    khtml/ecma/kjs_window.cpp
M  +5    -5    khtml/ecma/xmlhttprequest.cpp
M  +25   -22   khtml/html/html_canvasimpl.cpp
M  +4    -0    khtml/html/html_canvasimpl.h
M  +33   -35   khtml/misc/loader.cpp
M  +1    -1    khtml/rendering/render_canvas.cpp
M  +10   -12   khtml/rendering/render_form.cpp
M  +18   -11   khtml/rendering/render_replaced.cpp
M  +2    -2    khtml/rendering/render_table.cpp
M  +0    -1    kio/kio/kautomount.cpp
M  +31   -1    kio/kio/kfileitem.cpp
M  +6    -0    kio/kio/kfileitem.h
M  +2    -0    kio/tests/kfileitemtest.cpp
A  +88   -0    staging/kde4support/autotests/ksavefiletest.cpp     [License=
: LGPL (v2)]
A  +3    -0    staging/kde4support/autotests/ksavefiletest.h     [License: =
LGPL (v2)]
A  +47   -32   staging/kde4support/src/kdecore/ksavefile.cpp     [License: =
LGPL (v2)]
A  +33   -4    staging/kde4support/src/kdecore/ksavefile.h     [License: LG=
PL (v2)]
R  +1    -0    staging/kemoticons/src/providers/kde/emoticonstheme_kde.desk=
top
A  +1    -1    staging/kservice/src/sycoca/ksycoca.cpp     [License: LGPL (=
v2)]
A  +38   -2    tier1/kjs/autotests/ecmatest.cpp     [License: LGPL (v2+)]
R  +6    -4    tier1/kjs/autotests/ecmatest_broken_bestPractice
R  +43   -104  tier1/kjs/autotests/ecmatest_broken_ch07
R  +4    -57   tier1/kjs/autotests/ecmatest_broken_ch08
R  +121  -153  tier1/kjs/autotests/ecmatest_broken_ch10
R  +105  -126  tier1/kjs/autotests/ecmatest_broken_ch11
R  +28   -30   tier1/kjs/autotests/ecmatest_broken_ch12
R  +61   -64   tier1/kjs/autotests/ecmatest_broken_ch13
R  +8    -8    tier1/kjs/autotests/ecmatest_broken_ch14
R  +4    -9    tier1/kjs/autotests/ecmatest_broken_ch15.1
R  +1    -4    tier1/kjs/autotests/ecmatest_broken_ch15.10
R  +0    -0    tier1/kjs/autotests/ecmatest_broken_ch15.11
R  +0    -2    tier1/kjs/autotests/ecmatest_broken_ch15.12
R  +18   -2505 tier1/kjs/autotests/ecmatest_broken_ch15.2
R  +24   -103  tier1/kjs/autotests/ecmatest_broken_ch15.3
R  +39   -538  tier1/kjs/autotests/ecmatest_broken_ch15.4
R  +5    -7    tier1/kjs/autotests/ecmatest_broken_ch15.5
R  +0    -0    tier1/kjs/autotests/ecmatest_broken_ch15.6
R  +0    -1    tier1/kjs/autotests/ecmatest_broken_ch15.7
R  +0    -0    tier1/kjs/autotests/ecmatest_broken_ch15.8
R  +4    -18   tier1/kjs/autotests/ecmatest_broken_ch15.9
R  +13   -0    tier1/kjs/autotests/updateBroken.sh
A  +1    -0    tier1/kjs/src/kjs/CMakeLists.txt
R  +8    -1    tier1/kjs/src/kjs/CommonIdentifiers.h
A  +467  -120  tier1/kjs/src/kjs/array_instance.cpp     [License: LGPL (v2+=
)]
R  +16   -0    tier1/kjs/src/kjs/array_instance.h
A  +57   -5    tier1/kjs/src/kjs/date_object.cpp     [License: LGPL (v2+)]
R  +1    -1    tier1/kjs/src/kjs/date_object.h
A  +174  -2    tier1/kjs/src/kjs/function.cpp     [License: LGPL (v2+)]
R  +44   -0    tier1/kjs/src/kjs/function.h
A  +48   -0    tier1/kjs/src/kjs/function_object.cpp     [License: LGPL (v2=
+)]
R  +1    -1    tier1/kjs/src/kjs/function_object.h
A  +1922 -1843 tier1/kjs/src/kjs/grammar.cpp     [License: GPL (v3+) LGPL (=
v3+)]
R  +30   -11   tier1/kjs/src/kjs/grammar.h
A  +56   -14   tier1/kjs/src/kjs/grammar.y     [License: LGPL (v2+)]
A  +199  -1    tier1/kjs/src/kjs/object.cpp     [License: LGPL (v2+)]
R  +24   -6    tier1/kjs/src/kjs/object.h
A  +188  -3    tier1/kjs/src/kjs/object_object.cpp     [License: LGPL (v2+)]
A  +32   -0    tier1/kjs/src/kjs/operations.cpp     [License: LGPL (v2+)]
R  +4    -0    tier1/kjs/src/kjs/operations.h
R  +5    -0    tier1/kjs/src/kjs/property_map.h
R  +61   -13   tier1/kjs/src/kjs/property_slot.h
R  +292  -0    tier1/kjs/src/kjs/propertydescriptor.cpp
R  +105  -0    tier1/kjs/src/kjs/propertydescriptor.h
A  +5    -0    tier1/kjs/src/kjs/regexp.cpp     [License: LGPL (v2+)]
A  +11   -0    tier1/kjs/src/kjs/regexp.h     [License: LGPL (v2+)]
R  +1    -0    tier1/kjs/src/kjs/scriptfunction.h
A  +11   -1    tier1/kjs/src/kjs/string_object.cpp     [License: LGPL (v2+)]
R  +2    -1    tier1/kjs/src/kjs/string_object.h
R  +0    -1    tier1/kjs/src/wtf/HashTable.h
R  +7    -0    tier1/solid/src/solid/org.freedesktop.PowerManagement.xml
A  +24   -1    tier1/solid/src/solid/powermanagement.cpp     [License: LGPL]
R  +9    -6    tier1/solid/src/solid/powermanagement.h
R  +1    -0    tier1/solid/src/solid/powermanagement_p.h

http://commits.kde.org/kdelibs/01d4b9d084d76ff479453a972325a08bf381b55d
[prev in list] [next in list] [prev in thread] [next in thread]