~ubuntu-branches/ubuntu/oneiric/tomboy/oneiric-updates

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2011-07-06 10:06:49 UTC
  • mfrom: (1.3.21 upstream) (4.3.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20110706100649-fj04lw8mvc3fzwqv
Tags: 1.7.1-1ubuntu1
* Merge with Debian experimental, remaning changes:
  + Use dh-translations instead of manually stripping schema
  + Ubuntu patches:
    - Add Launchpad integration
    - Use Ubuntu One SSO
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
  + autoreconf for some of the above changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
281
281
libexecdir = @libexecdir@
282
282
localedir = @localedir@
283
283
localstatedir = @localstatedir@
284
 
lt_ECHO = @lt_ECHO@
285
284
mandir = @mandir@
286
285
mkdir_p = @mkdir_p@
287
286
oldincludedir = @oldincludedir@