~ubuntu-branches/ubuntu/saucy/kdevelop/saucy-proposed

Viewing all changes in revision 66.

  • Committer: Package Import Robot
  • Author(s): Jonathan Thomas
  • Date: 2012-06-03 21:01:59 UTC
  • mfrom: (2.2.10 sid)
  • Revision ID: package-import@ubuntu.com-20120603210159-gxrcrsb4nyi4db0d
Tags: 4:4.3.1-3ubuntu1
* Merge with Debian, remaining changes:
  - Keep kubuntu_01_appmenu_fix.diff
  - kdevelop-l10n replaces/breaks kdevelop-data (<< 4:4.3.1-3ubuntu1) due
    to file moves from this merge. Can be dropped next LTS.
  - Keep suggestion of kdevelop-custom-buildsystem by kdevelop
* Drop kdevelop-custom-buildsystem from a recommendation to a suggestion.
  Being a recommends seems a bit strict for a very optional plugin.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: