Revision: 4872
http://cel.svn.sourceforge.net/cel/?rev=4872&view=rev
Author: kickvb
Date: 2012-05-10 15:31:46 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Merged revisions 4868 via svnmerge from
https://cel.svn.sourceforge.net/svnroot/cel/cel/trunk
........
r4868 | kickvb | 2012-05-10 16:49:36 +0200 (Thu, 10 May 2012) | 2 lines
Added a missing linking entry to celtool
........
Revision Links:
--------------
http://cel.svn.sourceforge.net/cel/?rev=4868&view=rev
Modified Paths:
--------------
cel/branches/release/V2.0/plugins/tools/celconsole/Jamfile
cel/branches/release/V2.0/plugins/tools/triggers/Jamfile
Property Changed:
----------------
cel/branches/release/V2.0/
cel/branches/release/V2.0/scripts/0install/celstart-launcher-1.9.xml
cel/branches/release/V2.0/scripts/0install/celstart-runtime-1.9.xml
Property changes on: cel/branches/release/V2.0
___________________________________________________________________
Modified: svnmerge-integrated
-
/cel/trunk:1-4188,4191-4263,4265,4268-4273,4277-4311,4314,4316,4319,4326,4345-4346,4360,4379,4419,4609,4621,4718,4720,4723,4731,4747,4801,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853
/cel/branches/release/V1.4:1-3452,3796,3939
+
/cel/trunk:1-4188,4191-4263,4265,4268-4273,4277-4311,4314,4316,4319,4326,4345-4346,4360,4379,4419,4609,4621,4718,4720,4723,4731,4747,4801,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853,4868
/cel/branches/release/V1.4:1-3452,3796,3939
Modified: svn:mergeinfo
- /cel/branches/release/V1.4:3796,3939
/cel/branches/soc2009/quests:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh:4054-4116
/cel/trunk:4191-4263,4265,4268-4273,4277-4311,4314,4316,4319,4326,4345-4346,4360,4379,4419,4609,4621,4718,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853
+ /cel/branches/release/V1.4:3796,3939
/cel/branches/soc2009/quests:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh:4054-4116
/cel/trunk:4191-4263,4265,4268-4273,4277-4311,4314,4316,4319,4326,4345-4346,4360,4379,4419,4609,4621,4718,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853,4868
Modified: cel/branches/release/V2.0/plugins/tools/celconsole/Jamfile
===================================================================
--- cel/branches/release/V2.0/plugins/tools/celconsole/Jamfile 2012-05-10
15:21:39 UTC (rev 4871)
+++ cel/branches/release/V2.0/plugins/tools/celconsole/Jamfile 2012-05-10
15:31:46 UTC (rev 4872)
@@ -4,4 +4,5 @@
: celconsole.cpp celconsole.h
;
ExternalLibs celconsole : CRYSTAL ;
+LinkWith celconsole : celtool ;
Modified: cel/branches/release/V2.0/plugins/tools/triggers/Jamfile
===================================================================
--- cel/branches/release/V2.0/plugins/tools/triggers/Jamfile 2012-05-10
15:21:39 UTC (rev 4871)
+++ cel/branches/release/V2.0/plugins/tools/triggers/Jamfile 2012-05-10
15:31:46 UTC (rev 4872)
@@ -4,3 +4,4 @@
: [ Wildcard *.cpp *.h ]
;
ExternalLibs triggers : CRYSTAL ;
+LinkWith triggers : celtool ;
Property changes on:
cel/branches/release/V2.0/scripts/0install/celstart-launcher-1.9.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /cel/branches/release/V1.4/scripts/0install/celstart-launcher-1.9.xml:3796
/cel/branches/soc2009/quests/scripts/0install/celstart-launcher-1.9.xml:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh/scripts/0install/celstart-launcher-1.9.xml:4054-4116
/cel/trunk/scripts/0install/celstart-launcher-1.9.xml:4191-4263,4265,4268-4273,4277-4311,4419,4609,4621,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853
+ /cel/branches/release/V1.4/scripts/0install/celstart-launcher-1.9.xml:3796
/cel/branches/soc2009/quests/scripts/0install/celstart-launcher-1.9.xml:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh/scripts/0install/celstart-launcher-1.9.xml:4054-4116
/cel/trunk/scripts/0install/celstart-launcher-1.9.xml:4191-4263,4265,4268-4273,4277-4311,4419,4609,4621,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853,4868
Property changes on:
cel/branches/release/V2.0/scripts/0install/celstart-runtime-1.9.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /cel/branches/release/V1.4/scripts/0install/celstart-runtime-1.9.xml:3796
/cel/branches/soc2009/quests/scripts/0install/celstart-runtime-1.9.xml:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh/scripts/0install/celstart-runtime-1.9.xml:4054-4116
/cel/trunk/scripts/0install/celstart-runtime-1.9.xml:4191-4263,4265,4268-4273,4277-4311,4419,4609,4621,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853
+ /cel/branches/release/V1.4/scripts/0install/celstart-runtime-1.9.xml:3796
/cel/branches/soc2009/quests/scripts/0install/celstart-runtime-1.9.xml:3863-3864,3875-3885,3887-3897,3906-3930,3938-3942,3945,3950-3951,3953-3954,4109-4111
/cel/branches/soc2010/navmesh/scripts/0install/celstart-runtime-1.9.xml:4054-4116
/cel/trunk/scripts/0install/celstart-runtime-1.9.xml:4191-4263,4265,4268-4273,4277-4311,4419,4609,4621,4720,4731,4747,4803-4804,4806-4810,4812-4813,4815-4817,4821,4824,4846,4853,4868
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Cel-cvs-update mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cel-cvs-update
