~ubuntu-branches/ubuntu/trusty/xfdesktop4/trusty

« back to all changes in this revision

Viewing changes to pixmaps/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-03-19 16:33:54 UTC
  • mfrom: (3.1.14 experimental)
  • Revision ID: package-import@ubuntu.com-20140319163354-9jismnm7xh1jrskz
Tags: 4.11.4-1ubuntu1
* Merge from debian. Remaining changes:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).
  - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
    user background property of Accountsservice on backdrop change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
300
300
XFCONF_LIBS = @XFCONF_LIBS@
301
301
XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
302
302
XFCONF_VERSION = @XFCONF_VERSION@
 
303
XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
303
304
XGETTEXT = @XGETTEXT@
304
305
XGETTEXT_ARGS = @XGETTEXT_ARGS@
305
306
XMKMF = @XMKMF@