~ubuntu-branches/ubuntu/raring/konversation/raring-proposed

Viewing all changes in revision 55.

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-08 13:32:22 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20101108133222-tmw1eu9j1bzu479c
Tags: 1.3.1-2ubuntu1
* Merge with Debian, remaining changes:
 - Don't use debian_channel.diff
 - Add kubuntu_01_default_channels.diff
 - Add message-indicator/0001-Adds-support-for-Message-Indicator.diff
 - Build-dep on libindicate-qt-dev (>= 0.2.1)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: