← Back to branch summary

~phablet-team/webbrowser-app/trunk

« back to all changes in this revision

Viewing changes to src/app/webbrowser/ContentPickerDialog.qml

  • Committer: Olivier Tilloy
  • Date: 2016-03-10 05:56:42 UTC
  • mfrom: (1378 webbrowser-app)
  • mto: This revision was merged to the branch mainline in revision 1380.
  • Revision ID: olivier.tilloy@canonical.com-20160310055642-gcuwehtae8uq8hyr
Merge the latest changes from trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/webbrowser/ContentPickerDialog.qml
22
22
import Ubuntu.Content 1.3
23
23
import com.canonical.Oxide 1.8
24
24
import "../MimeTypeMapper.js" as MimeTypeMapper
 
25
import ".."
25
26
 
26
27
Component {
27
28
    Popups.PopupBase {