diff options
| author | Frédéric Péters <fpeters@0d.be> | 2009-08-20 15:37:11 +0200 |
|---|---|---|
| committer | Frédéric Péters <fpeters@0d.be> | 2009-08-20 15:37:11 +0200 |
| commit | f26a70b84182e20a09f6231a41cd5d0626cc6d60 (patch) | |
| tree | e77aa652bcd8525709f0d177aca8c7aeed7f7091 /Makefile.am | |
| parent | b4a68d7441671bd6165ef30af6303cf968c797e2 (diff) | |
| parent | c41ad9820304609c75b12897b1c823827b3be234 (diff) | |
| download | yelp-f26a70b84182e20a09f6231a41cd5d0626cc6d60.tar.gz | |
Merge branch 'master' into webkit
Conflicts:
configure.in
po/nb.po
src/Makefile.am
src/yelp-main.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 521669ce..9ccead58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src stylesheets po data +SUBDIRS = src stylesheets po data tests @INTLTOOL_DESKTOP_RULE@ |