~noskcaj/ubuntu/wily/epiphany-browser/merge

« back to all changes in this revision

Viewing changes to tests/data/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2015-06-02 10:42:34 UTC
  • mfrom: (1.10.3) (105.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20150602104234-aud9080wq37exs53
Tags: 3.16.1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/07_bookmarks.patch:
    Add Ubuntu-specific default bookmarks, borrowed from Firefox
  - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
    update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work
    correctly).
  - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
    for non-GNOME sessions

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Makefile.in generated by automake 1.13.4 from Makefile.am.
 
1
# Makefile.in generated by automake 1.14.1 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
114
114
ACLOCAL = @ACLOCAL@
115
115
ALL_LINGUAS = @ALL_LINGUAS@
116
116
AMTAR = @AMTAR@
117
 
AM_CFLAGS = @AM_CFLAGS@
118
 
AM_CPPFLAGS = @AM_CPPFLAGS@
119
117
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
120
 
AM_LDFLAGS = @AM_LDFLAGS@
121
118
AR = @AR@
122
119
AUTOCONF = @AUTOCONF@
123
120
AUTOHEADER = @AUTOHEADER@