dolphin/src/panels
Frank Reininghaus fa988586bc Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/panels/terminal/terminalpanel.cpp
	dolphin/src/panels/terminal/terminalpanel.h
2014-10-24 18:49:05 +02:00
..
folders Dolphin: port to KIO::pasteInfoText(). 2014-10-21 21:59:05 +02:00
information Merge remote-tracking branch 'origin/master' into frameworks 2014-10-24 18:49:05 +02:00
places Use the path instead of the display string in PlacesItemModel::closestItem, 2014-10-21 22:54:15 +02:00
terminal Merge remote-tracking branch 'origin/master' into frameworks 2014-10-24 18:49:05 +02:00
panel.cpp port Dolphin from KUrl to QUrl 2014-10-21 21:19:14 +02:00
panel.h port Dolphin from KUrl to QUrl 2014-10-21 21:19:14 +02:00