~kubuntu-members/knavalbattle/4.11

Viewing all changes in revision 1079.

  • Committer: Albert Astals Cid
  • Date: 2013-05-30 00:07:29 UTC
  • mfrom: (1060.1.13)
  • Revision ID: git-v1:6c58f141fa92ce1419793a3e01eae3cc2b8631fa
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
        data/pictures/default.desktop

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: