Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/export
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8453/runtime/xrpc/export
Modified Files:
Makefile.ag
Log Message:
propagated changes of Tuesday Dec 18 2007 - Wednesday Dec 19 2007
from the XQuery_0-20 branch to the development trunk
Please note:
There were conflicts in
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj,
and I am not sure, whether I resolved them correctly.
Please check carefully.
In case of doubt, feel free to undo this propagation
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj: r1.8 -> r1.9
and redo/propagate the conflicting changes
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj: r1.2.2.9 ->
1.2.2.10
(possibly selectively/partly) by hand.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/export/Makefile.ag,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.ag 21 Sep 2007 16:52:54 -0000 1.5
+++ Makefile.ag 19 Dec 2007 19:23:18 -0000 1.6
@@ -26,11 +26,11 @@
headers_html = {
HEADERS = html
DIR = datadir/MonetDB/xrpc/export
- SOURCES = index.html
+ SOURCES = index.html xrpc.html
}
headers_xq = {
HEADERS = xq
DIR = datadir/MonetDB/xrpc/export
- SOURCES = export.xq xrpc-mod.xq xrpc.html
+ SOURCES = export.xq xrpc-mod.xq
}
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
