diff options
| author | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
| commit | c4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch) | |
| tree | 5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /autogen.sh | |
| parent | cfdd33a19758224cb835efa705a410d3d4d0db91 (diff) | |
| parent | 3d800bf9b0133a613d28c31957c081d157a89af8 (diff) | |
| download | libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2 libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip | |
Mainline merge, resolve conflicts.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -9,4 +9,5 @@ which gnome-autogen.sh || { USE_GNOME2_MACROS=1 \ USE_COMMON_DOC_BUILD=yes \ -. gnome-autogen.sh +gnome-autogen.sh --enable-gtk-doc + |