← Back to branch summary

~kubuntu-members/poxml/4.11

Viewing all changes in revision 230.

  • Committer: Albert Astals Cid
  • Date: 2013-02-18 21:09:57 UTC
  • mfrom: (222.1.2)
  • Revision ID: git-v1:945b0c869cf9705c0304ea1c2f97c7b69ebd7ed7
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
        CMakeLists.txt

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: