← Back to branch summary

~kubuntu-members/kdeplasma-addons/4.11

Viewing all changes in revision 5648.

  • Committer: Montel Laurent
  • Date: 2013-08-09 05:24:20 UTC
  • mfrom: (5638.1.8)
  • Revision ID: git-v1:01489c019dd57c7cc2b71eff6ecaeb1c196dc6cd
Merge remote-tracking branch 'origin/KDE/4.11'

Conflicts:
        runners/translator/translator.cpp

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: