Viewing all changes in revision 399.
- Committer: Florian Boucault
- Date: 2011-02-10 00:29:18 UTC
- mfrom: (397.1.1 maverick)
- Revision ID: florian@boucault.net-20110210002918-3hh5snpj3khll1ib
Merged from lp:unity-2d minus natty specific changes:
- reverted lp:unity-2d revisions 360 and 361 that introduced the D-Bus name changes from org.ayatana.indicator.service to com.canonical.indicator.service as it is a Natty only change
- kept Conflicts and Replaces on unity-qt-*
- kept source branch in debian/copyright
- kept debian/changelog
- reverted lp:unity-2d revisions 360 and 361 that introduced the D-Bus name changes from org.ayatana.indicator.service to com.canonical.indicator.service as it is a Natty only change
- kept Conflicts and Replaces on unity-qt-*
- kept source branch in debian/copyright
- kept debian/changelog
- files added:
- debian/20_unity-2d-gconf-default
- debian/gconf
- session
- files modified:
- debian/control
expand all
collapse all
added
removed
