~ubuntu-branches/ubuntu/wily/sflphone/wily

Viewing all changes in revision 35.

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2015-08-12 07:25:39 UTC
  • mfrom: (4.3.6 sid)
  • Revision ID: package-import@ubuntu.com-20150812072539-uzh89mqziqijbda4
Tags: 1.4.1-0.2ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
  - Drop soprano, nepomuk build-deps.
* debian/patches/gcc-5.patch: Remove ambiguous std::string(0, 0)
  instantiation, to fix FTBFS. (Closes: #795233)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: