[ease/plugins: 30/37] Merge branch 'master' into plugins
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/plugins: 30/37] Merge branch 'master' into plugins
- Date: Sun, 22 Aug 2010 21:28:31 +0000 (UTC)
commit 447b20542ec71cee6b666a2f9a0af527e64571e7
Merge: ce288b6 b7ccf01
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date: Mon Jun 21 14:28:14 2010 +0200
Merge branch 'master' into plugins
Conflicts:
Makefile.am
po/POTFILES.in
Makefile.am | 18 +++---------------
configure.ac | 2 +-
data/Makefile.am | 11 +++++++++++
po/POTFILES.in | 2 --
4 files changed, 15 insertions(+), 18 deletions(-)
---
diff --cc Makefile.am
index da25cb1,69d7d78..46226f0
--- a/Makefile.am
+++ b/Makefile.am
@@@ -81,12 -79,10 +81,12 @@@ VALAFLAGS = --pkg glib-2.0
--pkg clutter-gst-1.0\
--pkg json-glib-1.0\
--pkg libarchive\
+ --pkg rest-extras-0.6\
-g \
+ --thread \
$(NULL)
- SUBDIRS = po
+ SUBDIRS = po data
ease_LDADD = \
$(EASE_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
