alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
104634b9cd
plasma-framework/graphicsview/private
History
David Faure e7e77f118a Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	cmake/modules/FindKDE4Internal.cmake [ON vs TRUE]
	experimental/libkdeclarative/kdeclarative.cpp [include changes]
	kdecore/CMakeLists.txt [kshareddatacache.cpp exception support, but file moved]
	kdecore/kernel/kcmdlineargs.cpp [+1 option, but qi18n]
	kdeui/widgets/ktextedit.cpp [moc]
	kdewebkit/kwebpage.cpp [QUrl]
	kfile/kfilewidget.cpp [QUrl]
	kfile/kurlnavigatortogglebutton.cpp [QT_NO_ACCESSIBILITY]
	kinit/kinit.cpp [document path]
	kio/kfile/kurlrequester.cpp [KDE::icon]
	kio/kio/kprotocolmanager.cpp [kded5]
	kio/kio/krun.cpp [document path]
	kioslave/ftp/ftp.cpp [QUrl]
	kioslave/http/kcookiejar/CMakeLists.txt [upd file resurrected]
	kioslave/http/kcookiejar/kcookiescfg.upd [resurrected]
	kioslave/http/kcookiejar/kcookiewin.cpp [KVBox porting]
	mimetypes/kde.xml [kexi gone]
	nepomuk/core/resourcedata.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	plasma/private/packages.cpp [Plasma::Applet::NoBackground]
	tier1/kjs/src/kjs/jsonstringify.cpp [unsigned int]
	tier1/solid/src/solid/CMakeLists.txt [hello udisks2]
2012-10-19 15:10:38 +02:00
..
animablegraphicswebview_p.h Convert to makedefine01 2012-08-24 03:16:04 +02:00
animablegraphicswebview.cpp move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
corona_p.h operations completely delegated to coronabase 2012-02-28 20:40:28 +01:00
focusindicator_p.h move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
focusindicator.cpp move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
graphicsviewappletprivate_p.h move some stuff in qgv's private 2012-02-28 20:00:42 +01:00
graphicsviewappletprivate.cpp KIcon("foo") -> KDE::icon("foo") 2012-04-28 13:17:42 +02:00
kineticscroll_p.h move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
kineticscroll.cpp move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
nativetabbar_p.h move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
nativetabbar.cpp Remove unneeded kcolorutils.h includes 2012-08-06 00:46:03 +02:00
style_p.h move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
style.cpp Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 2012-10-19 15:10:38 +02:00