Author: lindner
Date: Tue Sep 7 08:54:54 2010
New Revision: 993285
URL: http://svn.apache.org/viewvc?rev=993285&view=rev
Log:
merge license fix
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 7 08:54:54 2010
@@ -1 +1 @@
-/shindig/trunk:983949-993278
+/shindig/trunk:983949-993284
Modified: shindig/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=993285&r1=993284&r2=993285&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Tue Sep 7 08:54:54 2010
@@ -1171,6 +1171,7 @@
<exclude>php/test/misc/rewriter*.js</exclude>
<exclude>php/test/misc/*.html</exclude>
<exclude>php/test/misc/*.xml</exclude>
+ <exclude>php/test/certs/*</exclude>
<exclude>BUILD-JAVA</exclude>
<exclude>COMMITTERS</exclude>
<exclude>UPGRADING</exclude>
