From: <mie...@us...> - 2010-11-11 18:41:38
|
Revision: 6380 http://oorexx.svn.sourceforge.net/oorexx/?rev=6380&view=rev Author: miesfeld Date: 2010-11-11 18:41:29 +0000 (Thu, 11 Nov 2010) Log Message: ----------- Merge David's configure.ac fix from trunk into 4.1.0 Modified Paths: -------------- main/branches/4.1.0/trunk/configure.ac Property Changed: ---------------- main/branches/4.1.0/trunk/ Property changes on: main/branches/4.1.0/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /main/trunk:4387,4396-4397,4460,4464,4466,4468,4506,4543-4544,4547,4562,4564,4603,4605,4696,4873,4884,4886,4917,4922,4950-4952,4967,4969,5090,5092-5094,5098,5104,5106-5107,5110,5114,5133,5139,5148,5152,5166,5168,5179,5181,5194,5203-5204,5206-5210,5223,5226,5233,5238,5242,5252-5253,5271-5272,5277,5307,5317,5320-5321,5342,5345,5401-5402,5438-5440,5476,5487,5490,5493-5494,5510,5514,5539,5549,5553,5561,5744,5957,5974,6090,6093,6100,6112,6133,6151,6197,6202,6218-6219,6241,6266,6300-6301,6352-6353,6355,6364,6369 + /main/trunk:4387,4396-4397,4460,4464,4466,4468,4506,4543-4544,4547,4562,4564,4603,4605,4696,4873,4884,4886,4917,4922,4950-4952,4967,4969,5090,5092-5094,5098,5104,5106-5107,5110,5114,5133,5139,5148,5152,5166,5168,5179,5181,5194,5203-5204,5206-5210,5223,5226,5233,5238,5242,5252-5253,5271-5272,5277,5307,5317,5320-5321,5342,5345,5401-5402,5438-5440,5476,5487,5490,5493-5494,5510,5514,5539,5549,5553,5561,5744,5957,5974,6090,6093,6100,6112,6133,6151,6197,6202,6218-6219,6241,6266,6300-6301,6352-6353,6355,6364,6369,6379 Modified: main/branches/4.1.0/trunk/configure.ac =================================================================== --- main/branches/4.1.0/trunk/configure.ac 2010-11-10 16:14:04 UTC (rev 6379) +++ main/branches/4.1.0/trunk/configure.ac 2010-11-11 18:41:29 UTC (rev 6380) @@ -420,6 +420,8 @@ platform/unix/debian/postinst rexxapi/server/platform/unix/rxapid samples/Makefile + samples/native.api/Makefile + samples/native.api/call.example/Makefile samples/unix/Makefile samples/unix/api/Makefile samples/unix/api/callrexx/Makefile @@ -447,12 +449,15 @@ samples/windows/oodialog/bmp/Makefile samples/windows/oodialog/examples/Makefile samples/windows/oodialog/examples/resources/Makefile + samples/windows/oodialog/oleinfo/Makefile samples/windows/oodialog/ooRexxTry/Makefile samples/windows/oodialog/ooRexxTry/doc/Makefile samples/windows/oodialog/rc/Makefile samples/windows/oodialog/res/Makefile + samples/windows/oodialog/sysinfo/Makefile samples/windows/oodialog/tutorial/Makefile samples/windows/oodialog/wav/Makefile + samples/windows/oodialog/winsystem/Makefile samples/windows/rexutils/Makefile samples/windows/winsystem/Makefile samples/windows/wsh/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |