From: <vk...@us...> - 2008-01-26 16:57:19
|
Revision: 28596 http://crystal.svn.sourceforge.net/crystal/?rev=28596&view=rev Author: vknecht Date: 2008-01-26 08:57:15 -0800 (Sat, 26 Jan 2008) Log Message: ----------- - Vincent merged r28541 into 1.2 (fixed vertexlight.cgvp not getting installed). Modified Paths: -------------- CS/branches/release/V1.2/data/shader/Jamfile CS/branches/release/V1.2/docs/history.txt CS/branches/release/V1.2/docs/history_1.2.txt Property Changed: ---------------- CS/branches/release/V1.2/ Property changes on: CS/branches/release/V1.2 ___________________________________________________________________ Name: svnmerge-integrated - /CS/trunk:1-26960,26963-26968,26971-26974,26978-26983,26986,26988,26990-26992,26994-26997,26999-27003,27007-27046,27048-27049,27051-27053,27055-27094,27096-27099,27101,27106-27115,27118-27129,27132-27157,27159-27171,27173-27174,27176-27183,27185-27190,27193,27195,27211-27215,27222-27224,27229-27235,27238-27239,27241-27255,27257-27261,27263-27265,27269-27273,27275-27278,27281-27282,27284-27292,27294-27303,27305-27323,27330-27333,27336,27343-27350,27352-27370,27372-27373,27377-27380,27382-27384,27386-27387,27389-27390,27392-27393,27400-27407,27409,27412,27414,27417-27420,27422-27423,27431-27432,27434-27449,27451-27454,27456-27476,27478,27491-27492,27494-27495,27497-27499,27504-27506,27508-27513,27518,27526-27527,27530-27532,27537-27540,27543-27544,27548-27550,27553,27557-27560,27562-27564,27567,27569-27579,27581,27583-27588,27590,27593-27602,27605-27627,27629-27631,27635,27637,27641-27644,27649,27651-27652,27654-27659,27661-27662,27664-27670,27676-27677,27683-27684,27694,27696-27697,27702,27705-27708,27710-27716,27718-27719,27722,27726-27730,27733-27738,27741,27743-27744,27753,27762,27766-27768,27779-27780,27785-27791,27793-27795,27797,27804-27805,27813,27815-27816,27822,27826,27832,27843,27850,27870-27871,27873-27874,27876,27878-27885,27887,27891-27892,27894-27898,27901-27902,27904-27905,27908,27911-27918,27920-27921,27928,27937,27942,27952,27961,27974,27976-27979,27981-27983,27985-27987,28007,28013,28017-28027,28030,28033-28041,28043,28045-28053,28056,28058,28061-28081,28083-28090,28094,28106,28115-28116,28118-28119,28121,28134,28139,28143-28146,28156,28160-28164,28167,28169,28175-28176,28179,28181-28182,28187,28189-28190,28192,28195,28197-28198,28201,28211-28215,28217,28232-28234,28236-28238,28243,28245-28246,28248-28260,28263-28267,28269-28271,28273,28278-28283,28290,28292-28293,28295,28297-28298,28306,28308-28310,28315-28318,28327,28330-28331,28333,28335-28339,28346-28347,28352,28354,28356,28366-28369,28372-28381,28389-28394,28397-28399,28401-28403,28419,28423-28425,28429,28431-28432,28434,28437,28440-28448,28450-28451,28454,28465-28470,28478-28479,28482,28484-28486,28489-28492,28496,28498,28505-28506,28509,28511-28512 + /CS/trunk:1-26960,26963-26968,26971-26974,26978-26983,26986,26988,26990-26992,26994-26997,26999-27003,27007-27046,27048-27049,27051-27053,27055-27094,27096-27099,27101,27106-27115,27118-27129,27132-27157,27159-27171,27173-27174,27176-27183,27185-27190,27193,27195,27211-27215,27222-27224,27229-27235,27238-27239,27241-27255,27257-27261,27263-27265,27269-27273,27275-27278,27281-27282,27284-27292,27294-27303,27305-27323,27330-27333,27336,27343-27350,27352-27370,27372-27373,27377-27380,27382-27384,27386-27387,27389-27390,27392-27393,27400-27407,27409,27412,27414,27417-27420,27422-27423,27431-27432,27434-27449,27451-27454,27456-27476,27478,27491-27492,27494-27495,27497-27499,27504-27506,27508-27513,27518,27526-27527,27530-27532,27537-27540,27543-27544,27548-27550,27553,27557-27560,27562-27564,27567,27569-27579,27581,27583-27588,27590,27593-27602,27605-27627,27629-27631,27635,27637,27641-27644,27649,27651-27652,27654-27659,27661-27662,27664-27670,27676-27677,27683-27684,27694,27696-27697,27702,27705-27708,27710-27716,27718-27719,27722,27726-27730,27733-27738,27741,27743-27744,27753,27762,27766-27768,27779-27780,27785-27791,27793-27795,27797,27804-27805,27813,27815-27816,27822,27826,27832,27843,27850,27870-27871,27873-27874,27876,27878-27885,27887,27891-27892,27894-27898,27901-27902,27904-27905,27908,27911-27918,27920-27921,27928,27937,27942,27952,27961,27974,27976-27979,27981-27983,27985-27987,28007,28013,28017-28027,28030,28033-28041,28043,28045-28053,28056,28058,28061-28081,28083-28090,28094,28106,28115-28116,28118-28119,28121,28134,28139,28143-28146,28156,28160-28164,28167,28169,28175-28176,28179,28181-28182,28187,28189-28190,28192,28195,28197-28198,28201,28211-28215,28217,28232-28234,28236-28238,28243,28245-28246,28248-28260,28263-28267,28269-28271,28273,28278-28283,28290,28292-28293,28295,28297-28298,28306,28308-28310,28315-28318,28327,28330-28331,28333,28335-28339,28346-28347,28352,28354,28356,28366-28369,28372-28381,28389-28394,28397-28399,28401-28403,28419,28423-28425,28429,28431-28432,28434,28437,28440-28448,28450-28451,28454,28465-28470,28478-28479,28482,28484-28486,28489-28492,28496,28498,28505-28506,28509,28511-28512,28541 Modified: CS/branches/release/V1.2/data/shader/Jamfile =================================================================== --- CS/branches/release/V1.2/data/shader/Jamfile 2008-01-26 16:53:33 UTC (rev 28595) +++ CS/branches/release/V1.2/data/shader/Jamfile 2008-01-26 16:57:15 UTC (rev 28596) @@ -1,6 +1,6 @@ SubDir TOP data shader ; -InstallData [ Wildcard *.afp *.avp *.fvp *.xml ] : data shader ; +InstallData [ Wildcard *.afp *.avp *.fvp *.xml *.cgvp ] : data shader ; SubInclude TOP data shader character ; SubInclude TOP data shader extrudeGlow ; Modified: CS/branches/release/V1.2/docs/history.txt =================================================================== --- CS/branches/release/V1.2/docs/history.txt 2008-01-26 16:53:33 UTC (rev 28595) +++ CS/branches/release/V1.2/docs/history.txt 2008-01-26 16:57:15 UTC (rev 28596) @@ -6,6 +6,8 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +23-Jan-2008 + - caedes fixed vertexlight.cgvp not getting installed. 19-Jan-2008 - res fixed some wrong casts and a leak in sprcal3d. 18-Jan-2008 Modified: CS/branches/release/V1.2/docs/history_1.2.txt =================================================================== --- CS/branches/release/V1.2/docs/history_1.2.txt 2008-01-26 16:53:33 UTC (rev 28595) +++ CS/branches/release/V1.2/docs/history_1.2.txt 2008-01-26 16:57:15 UTC (rev 28596) @@ -46,6 +46,8 @@ now re-usable via visibility.m4). - Vincent merged r28498 into 1.2 (cswinGetErrorMessage improvement). - Vincent merged r28505 into 1.2 (sprcal3d fixes). + - Vincent merged r28541 into 1.2 (fixed vertexlight.cgvp not getting + installed). 25-Jan-2008 - Vincent merged r28017 into 1.2 (GM leak fix). - Vincent merged r28018 into 1.2 (leak guard fixes). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |