From: Heikki Levanto <heikki@indexdata.dk>
Date: Wed, 12 Jun 2013 13:31:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into rewrite-filter
X-Git-Tag: v1.3.59~57^2~8
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=a370d3def5758d5f2d1d7113a27871655fc7cec5;p=metaproxy-moved-to-github.git

Merge remote-tracking branch 'origin/master' into rewrite-filter
---

a370d3def5758d5f2d1d7113a27871655fc7cec5
diff --cc src/Makefile.am
index 42bb6b3,ea0cd46..92f526e
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -58,8 -56,9 +57,10 @@@ libmetaproxy_la_SOURCES = 
  	torus.cpp torus.hpp \
  	url_recipe.cpp \
  	util.cpp \
 +	html_parser.hpp html_parser.cpp \
  	router_chain.cpp \
+         router_flexml.hpp router_flexml.cpp \
+ 	router_xml.cpp \
  	xmlutil.cpp
  
  libmetaproxy_la_LIBADD = $(YAZPPLALIB) \