~ubuntu-branches/ubuntu/quantal/conglomerate/quantal

Viewing all changes in revision 12.

  • Committer: Dave Walker (Daviey)
  • Author(s): Logan Rosen
  • Date: 2012-09-15 21:58:49 UTC
  • mfrom: (11.1.1 conglomerate)
  • Revision ID: davewalker@ubuntu.com-20120915215849-9n6rx1fp5w95icg6
Tags: 0.9.1-3.3ubuntu1
* Merge from Debian unstable (LP: #1016032). Remaining change:
  - debian/patches/remove-gnome-entry-from-desktop.dpatch: Make .desktop
    files freedesktop compliant
* Non-maintainer upload.
* fix_duplicate_clone.dpatch: Rename clone functions. (Closes: #666584).
* Remove rpath setting in conglomerate binary with chrpath.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: