Menu
▾
▴
[Crystal-cvs] SF.net SVN: crystal:[32943] CS/branches/release/V1.4
|
From: <sun...@us...> - 2009-09-02 13:03:47
|
Revision: 32943
http://crystal.svn.sourceforge.net/crystal/?rev=32943&view=rev
Author: sunshine
Date: 2009-09-02 13:03:38 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
Merged revisions 32941 via svnmerge from
https://crystal.svn.sourceforge.net/svnroot/crystal/CS/trunk
........
r32941 | sunshine | 2009-09-02 08:59:45 -0400 (Wed, 02 Sep 2009) | 8 lines
When retrieving Java-related paths via the `java` command, checkjava.m4
now ensures that the current directory is mentioned by the class
path. This resolves problems with older or broken installations which do
not search the current directory by default. Also now captures output of
the `javac` command when building `conftest.java` in order to avoid
pollution of `configure` output and to ensure that any compilation
problems are easily retrievable from `config.log. Resolves #690.
........
Modified Paths:
--------------
CS/branches/release/V1.4/mk/autoconf/checkjava.m4
Property Changed:
----------------
CS/branches/release/V1.4/
CS/branches/release/V1.4/bin/guidregistry.py
CS/branches/release/V1.4/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp
CS/branches/release/V1.4/scripts/msi/CS-all.wxs
CS/branches/release/V1.4/scripts/msi/CS-directory-demo.wxi
CS/branches/release/V1.4/scripts/msi/CS-directory-runtime.wxi
CS/branches/release/V1.4/scripts/msi/CS-directory-sdk.wxi
CS/branches/release/V1.4/scripts/msi/CS-feature-demo.wxi
CS/branches/release/V1.4/scripts/msi/CS-feature-runtime.wxi
CS/branches/release/V1.4/scripts/msi/CS-feature-sdk.wxi
Property changes on: CS/branches/release/V1.4
___________________________________________________________________
Modified: svnmerge-integrated
- /CS/branches/feature/newanim:1-29823,29839-29840,29842-29865,29944-29973,29976,29978-29981,29983-29996,29999-30013 /CS/branches/feature/rendermanager:1-29759,29761-29886 /CS/branches/release/V1.4:1-29935,30181,30333,30463 /CS/trunk:1-29873,29875-29886,29888,29891,29893-29895,29908,29911,29921,29929,29931-29932,29937-29938,29944-29945,29968-29970,29972-29975,29977,29979-29989,29991,29997-29999,30004-30006,30009-30015,30022,30025,30032-30040,30042,30047-30050,30052-30054,30065-30069,30077-30078,30082-30085,30092,30096,30101-30102,30107-30113,30115-30116,30118,30125-30129,30131-30132,30136,30145,30152,30163,30165-30166,30170,30174-30175,30180-30186,30194-30199,30204,30209,30215-30219,30222-30223,30225-30232,30234-30236,30239,30241-30245,30247-30248,30258,30261-30262,30268-30269,30274-30277,30279-30288,30291-30292,30294,30296-30300,30302-30303,30305,30307-30308,30310-30312,30316,30323,30325-30327,30329-30333,30335,30337-30346,30348-30354,30357-30379,30383-30385,30392,30395-30396,30407-30415,30417,30419-30422,30424-30426,30429-30431,30433-30435,30437,30441-30450,30452-30459,30463,30466-30468,30470-30471,30473-30487,30489-30491,30494-30495,30498-30503,30506,30509,30514,30516-30517,30524-30526,30528-30531,30536-30537,30539,30549,30551-30557,30563-30576,30578,30584,30586,30588-30589,30593-30599,30601-30603,30605-30606,30610-30611,30613-30615,30618,30620-30622,30627,30635,30640-30661,30663-30666,30671-30676,30678,30680-30681,30683-30687,30690-30718,30720-30722,30724-30727,30730,30732-30749,30751-30753,30755-30763,30766,30768-30797,30799-30807,30809-30817,30819-30826,30828,30832-30833,30835-30842,30844-30851,30855,30858-30859,30861-30864,30866-30868,30877-30878,30880-30898,30900-30903,30905-30915,30917-30919,30921,30923-30924,30927-30937,30939,30942,30944-30947,30949,30951,30953,30955,30957,30960,30964-30966,30968-30973,30975-30976,30979-30982,30985-30991,30994-30995,30997-30999,31001,31004-31005,31012-31013,31015,31017,31019,31021,31025,31028,31030,31036,31049-31050,31053-31054,31056-31063,31069-31072,31074-31076,31081,31083-31085,31087-31088,31090-31095,31102-31107,31119-31126,31129-31158,31162-31179,31235,31247,31251,31254-31255,31257,31264-31265,31268,31279,31295,31310-31316,31318,31320-31322,31328,31344,31349,31351-31354,31357,31360,31363-31365,31367-31371,31373-31374,31404,31420,31444-31451,31453-31456,31458,31474-31475,31478,31480,31482-31483,31485-31486,31488-31489,31499,31501,31504-31505,31512,31519,31521,31523-31531,31536-31537,31540,31542-31548,31550-31553,31560,31562,31564,31568-31571,31581-31586,31592,31596-31597,31599-31600,31602,31606-31609,31622-31625,31630,31632,31634-31635,31639-31647,31654,31667,31690-31691,31710,31713,31722-31723,31730,31763,31767,31779-31783,31793-31794,31810,31813,31819-31824,31827-31829,31831,31834-31835,31841-31842,31851-31854,31860,31862,31867,31875-31877,31879-31880,31882-31884,31886-31890,31892,31896,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,31961,32015,32018,32037-32039,32041,32055,32072-32073,32075-32077,32079-32085,32087,32109,32114-32117,32139,32148,32150-32151,32155-32156,32193,32195-32196,32198,32202,32204,32206,32208,32213,32216-32236,32241,32251,32253,32259,32261,32277,32284-32285,32294,32305,32307,32309-32310,32316-32317,32320-32336,32339,32341-32342,32344,32349-32359,32364-32366,32368,32370,32376-32377,32380-32381,32387,32389-32390,32393-32395,32404-32405,32413,32418,32424-32425,32430-32432,32442-32444,32446-32452,32454-32456,32458,32462,32464-32465,32467-32470,32476,32478,32483,32485-32495,32497-32498,32500-32502,32505-32506,32509-32510,32512,32517,32520,32522,32529,32531-32535,32537,32539-32552,32559-32561,32564,32566,32570,32575,32580,32584-32594,32596,32599-32602,32604,32608-32614,32616,32618,32620-32625,32627-32628,32633-32634,32637,32643,32651,32653-32654,32657-32660,32665-32670,32672-32675,32677-32680,32682-32686,32688-32689,32691-32693,32695-32696,32698-32700,32702,32704-32706,32708,32710-32712,32714,32719-32720,32722,32725-32726,32738,32741-32748,32750,32754-32755,32760,32762,32766-32767,32769,32775-32776,32778-32787,32789-32792,32794-32801,32803-32809,32811,32816-32820,32822-32830,32832-32833,32835,32837-32847,32849,32856-32861,32870-32871,32873-32874,32876-32877,32879-32881,32890-32894,32897-32904,32908-32912,32915,32937
+ /CS/branches/feature/newanim:1-29823,29839-29840,29842-29865,29944-29973,29976,29978-29981,29983-29996,29999-30013 /CS/branches/feature/rendermanager:1-29759,29761-29886 /CS/branches/release/V1.4:1-29935,30181,30333,30463 /CS/trunk:1-29873,29875-29886,29888,29891,29893-29895,29908,29911,29921,29929,29931-29932,29937-29938,29944-29945,29968-29970,29972-29975,29977,29979-29989,29991,29997-29999,30004-30006,30009-30015,30022,30025,30032-30040,30042,30047-30050,30052-30054,30065-30069,30077-30078,30082-30085,30092,30096,30101-30102,30107-30113,30115-30116,30118,30125-30129,30131-30132,30136,30145,30152,30163,30165-30166,30170,30174-30175,30180-30186,30194-30199,30204,30209,30215-30219,30222-30223,30225-30232,30234-30236,30239,30241-30245,30247-30248,30258,30261-30262,30268-30269,30274-30277,30279-30288,30291-30292,30294,30296-30300,30302-30303,30305,30307-30308,30310-30312,30316,30323,30325-30327,30329-30333,30335,30337-30346,30348-30354,30357-30379,30383-30385,30392,30395-30396,30407-30415,30417,30419-30422,30424-30426,30429-30431,30433-30435,30437,30441-30450,30452-30459,30463,30466-30468,30470-30471,30473-30487,30489-30491,30494-30495,30498-30503,30506,30509,30514,30516-30517,30524-30526,30528-30531,30536-30537,30539,30549,30551-30557,30563-30576,30578,30584,30586,30588-30589,30593-30599,30601-30603,30605-30606,30610-30611,30613-30615,30618,30620-30622,30627,30635,30640-30661,30663-30666,30671-30676,30678,30680-30681,30683-30687,30690-30718,30720-30722,30724-30727,30730,30732-30749,30751-30753,30755-30763,30766,30768-30797,30799-30807,30809-30817,30819-30826,30828,30832-30833,30835-30842,30844-30851,30855,30858-30859,30861-30864,30866-30868,30877-30878,30880-30898,30900-30903,30905-30915,30917-30919,30921,30923-30924,30927-30937,30939,30942,30944-30947,30949,30951,30953,30955,30957,30960,30964-30966,30968-30973,30975-30976,30979-30982,30985-30991,30994-30995,30997-30999,31001,31004-31005,31012-31013,31015,31017,31019,31021,31025,31028,31030,31036,31049-31050,31053-31054,31056-31063,31069-31072,31074-31076,31081,31083-31085,31087-31088,31090-31095,31102-31107,31119-31126,31129-31158,31162-31179,31235,31247,31251,31254-31255,31257,31264-31265,31268,31279,31295,31310-31316,31318,31320-31322,31328,31344,31349,31351-31354,31357,31360,31363-31365,31367-31371,31373-31374,31404,31420,31444-31451,31453-31456,31458,31474-31475,31478,31480,31482-31483,31485-31486,31488-31489,31499,31501,31504-31505,31512,31519,31521,31523-31531,31536-31537,31540,31542-31548,31550-31553,31560,31562,31564,31568-31571,31581-31586,31592,31596-31597,31599-31600,31602,31606-31609,31622-31625,31630,31632,31634-31635,31639-31647,31654,31667,31690-31691,31710,31713,31722-31723,31730,31763,31767,31779-31783,31793-31794,31810,31813,31819-31824,31827-31829,31831,31834-31835,31841-31842,31851-31854,31860,31862,31867,31875-31877,31879-31880,31882-31884,31886-31890,31892,31896,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,31961,32015,32018,32037-32039,32041,32055,32072-32073,32075-32077,32079-32085,32087,32109,32114-32117,32139,32148,32150-32151,32155-32156,32193,32195-32196,32198,32202,32204,32206,32208,32213,32216-32236,32241,32251,32253,32259,32261,32277,32284-32285,32294,32305,32307,32309-32310,32316-32317,32320-32336,32339,32341-32342,32344,32349-32359,32364-32366,32368,32370,32376-32377,32380-32381,32387,32389-32390,32393-32395,32404-32405,32413,32418,32424-32425,32430-32432,32442-32444,32446-32452,32454-32456,32458,32462,32464-32465,32467-32470,32476,32478,32483,32485-32495,32497-32498,32500-32502,32505-32506,32509-32510,32512,32517,32520,32522,32529,32531-32535,32537,32539-32552,32559-32561,32564,32566,32570,32575,32580,32584-32594,32596,32599-32602,32604,32608-32614,32616,32618,32620-32625,32627-32628,32633-32634,32637,32643,32651,32653-32654,32657-32660,32665-32670,32672-32675,32677-32680,32682-32686,32688-32689,32691-32693,32695-32696,32698-32700,32702,32704-32706,32708,32710-32712,32714,32719-32720,32722,32725-32726,32738,32741-32748,32750,32754-32755,32760,32762,32766-32767,32769,32775-32776,32778-32787,32789-32792,32794-32801,32803-32809,32811,32816-32820,32822-32830,32832-32833,32835,32837-32847,32849,32856-32861,32870-32871,32873-32874,32876-32877,32879-32881,32890-32894,32897-32904,32908-32912,32915,32937,32941
Modified: svn:mergeinfo
- /CS/branches/feature/newanim:29839,29842-29865,29944,30013
/CS/branches/feature/plugin-merge:31103,31131-31137
/CS/branches/soc2008/threadcomm:30471,30486
/CS/branches/soc2009/postprocessing:32779-32780
/CS/trunk:29921,29991,30004,30048,30066,30165-30166,30232,30243,30262,30332,30350,30359-30360,30396,30408,30417,30419-30420,30424-30426,30441,30443-30450,30466,30473,30487,30489-30491,30495,30498-30503,30514,30539,30549,30551,30553-30557,30564,30570,30576,30586,30588-30589,30596-30599,30601,30605-30606,30610-30611,30614,30618,30620-30622,30627,30635,30643,30687,30698-30699,30710,30746-30749,30751,30755-30761,30771-30776,30784-30785,30793-30796,30799-30801,30805,30815,30819,30821-30822,30832,30837-30838,30846,30880,30897,30908-30910,30932-30937,30951,30953,30957,30960,30964-30966,30968-30970,30979-30980,30982,30985-30991,30995,30997-30999,31001,31015,31019,31021,31028,31050,31053-31054,31061,31070-31072,31076,31083-31085,31087,31090-31092,31095,31138-31139,31247,31251,31254-31255,31257,31264-31265,31279,31295,31310,31313-31315,31321-31322,31328,31344,31357,31360,31363-31365,31371,31404,31444,31447,31449,31453-31456,31474,31478,31501,31519,31523-31524,31526,31528-31530,31536,31543,31545,31547,31553,31560,31564,31568,31585-31586,31592,31599-31600,31602,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31667,31690,31710,31722,31730,31763,31767,31779-31783,31810,31813,31819,31821-31823,31827-31829,31831,31834,31841-31842,31892,31896,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,31961,32015,32018,32037-32039,32041,32055,32072,32085,32087,32109,32114-32117,32139,32148,32155,32193,32195-32196,32198,32202,32204,32206,32208,32213,32225,32227-32229,32234,32236,32251,32259,32277,32284-32285,32294,32305,32307,32335-32336,32341,32344,32349,32356,32358,32380,32387,32390,32393-32394,32430,32446-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32618,32623-32624,32637,32675,32677,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32803,32833,32859,32870,32873,32879-32881,32890-32894,32897-32904,32908-32912,32915,32937
+ /CS/branches/feature/newanim:29839,29842-29865,29944,30013
/CS/branches/feature/plugin-merge:31103,31131-31137
/CS/branches/soc2008/threadcomm:30471,30486
/CS/branches/soc2009/postprocessing:32779-32780
/CS/trunk:29921,29991,30004,30048,30066,30165-30166,30232,30243,30262,30332,30350,30359-30360,30396,30408,30417,30419-30420,30424-30426,30441,30443-30450,30466,30473,30487,30489-30491,30495,30498-30503,30514,30539,30549,30551,30553-30557,30564,30570,30576,30586,30588-30589,30596-30599,30601,30605-30606,30610-30611,30614,30618,30620-30622,30627,30635,30643,30687,30698-30699,30710,30746-30749,30751,30755-30761,30771-30776,30784-30785,30793-30796,30799-30801,30805,30815,30819,30821-30822,30832,30837-30838,30846,30880,30897,30908-30910,30932-30937,30951,30953,30957,30960,30964-30966,30968-30970,30979-30980,30982,30985-30991,30995,30997-30999,31001,31015,31019,31021,31028,31050,31053-31054,31061,31070-31072,31076,31083-31085,31087,31090-31092,31095,31138-31139,31247,31251,31254-31255,31257,31264-31265,31279,31295,31310,31313-31315,31321-31322,31328,31344,31357,31360,31363-31365,31371,31404,31444,31447,31449,31453-31456,31474,31478,31501,31519,31523-31524,31526,31528-31530,31536,31543,31545,31547,31553,31560,31564,31568,31585-31586,31592,31599-31600,31602,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31667,31690,31710,31722,31730,31763,31767,31779-31783,31810,31813,31819,31821-31823,31827-31829,31831,31834,31841-31842,31892,31896,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,31961,32015,32018,32037-32039,32041,32055,32072,32085,32087,32109,32114-32117,32139,32148,32155,32193,32195-32196,32198,32202,32204,32206,32208,32213,32225,32227-32229,32234,32236,32251,32259,32277,32284-32285,32294,32305,32307,32335-32336,32341,32344,32349,32356,32358,32380,32387,32390,32393-32394,32430,32446-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32618,32623-32624,32637,32675,32677,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32803,32833,32859,32870,32873,32879-32881,32890-32894,32897-32904,32908-32912,32915,32937,32941
Property changes on: CS/branches/release/V1.4/bin/guidregistry.py
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/bin/guidregistry.py:31103,31131-31137
/CS/branches/release/V1.4/scripts/msi/csguidregistry.py:30463
/CS/branches/soc2008/threadcomm/scripts/msi/csguidregistry.py:30471,30486,30678,30681,30720,30722,30753
/CS/trunk/bin/guidregistry.py:30048,30643,30699,30960,30965-30966,30968-30970,30986-30989,30998-30999,31001,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/bin/guidregistry.py:31103,31131-31137
/CS/branches/release/V1.4/scripts/msi/csguidregistry.py:30463
/CS/branches/soc2008/threadcomm/scripts/msi/csguidregistry.py:30471,30486,30678,30681,30720,30722,30753
/CS/trunk/bin/guidregistry.py:30048,30643,30699,30960,30965-30966,30968-30970,30986-30989,30998-30999,31001,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Modified: CS/branches/release/V1.4/mk/autoconf/checkjava.m4
===================================================================
--- CS/branches/release/V1.4/mk/autoconf/checkjava.m4 2009-09-02 13:00:26 UTC (rev 32942)
+++ CS/branches/release/V1.4/mk/autoconf/checkjava.m4 2009-09-02 13:03:38 UTC (rev 32943)
@@ -97,7 +97,7 @@
}
}
EOF
- $1 conftest.java
+ AC_RUN_LOG([$1 conftest.java])
])
@@ -107,7 +107,7 @@
AC_DEFUN([_CS_JAVA_PROPERTY],
- [AC_RUN_LOG([$2 conftest $1])])
+ [AC_RUN_LOG([CLASSPATH=. $2 conftest $1])])
AC_DEFUN([_CS_JAVA_PLATFORM],
Property changes on: CS/branches/release/V1.4/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:31103,31131-31137
/CS/branches/feature/pseudoinstancing/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:31879-31880
/CS/branches/release/V1.4/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:30463
/CS/branches/soc2008/threadcomm/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:29857,30131-30132,30341,30352-30353,30471,30486,30517,30531,30644-30649,30651-30654,30656-30661,30663-30665,30671,30673-30674,30676,30678,30681,30683-30685,30690-30691,30693-30697,30701,30703-30707,30709,30711-30718,30720-30722,30724-30726,30738-30744,30753,30769-30770,30782-30783,30804,30905,31142-31152,31157-31158,31167-31172,31175-31179
/CS/branches/soc2009/postprocessing/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp:32779-32780
/CS/trunk/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp:30048,31821-31823,31841-31842,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:31103,31131-31137
/CS/branches/feature/pseudoinstancing/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:31879-31880
/CS/branches/release/V1.4/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:30463
/CS/branches/soc2008/threadcomm/plugins/video/canvas/xwindow/xalert_gtk/alert.cpp:29857,30131-30132,30341,30352-30353,30471,30486,30517,30531,30644-30649,30651-30654,30656-30661,30663-30665,30671,30673-30674,30676,30678,30681,30683-30685,30690-30691,30693-30697,30701,30703-30707,30709,30711-30718,30720-30722,30724-30726,30738-30744,30753,30769-30770,30782-30783,30804,30905,31142-31152,31157-31158,31167-31172,31175-31179
/CS/branches/soc2009/postprocessing/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp:32779-32780
/CS/trunk/plugins/video/canvas/xwindow/xalert_gtk/gtk_alert.cpp:30048,31821-31823,31841-31842,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-all.wxs
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-all.wxs:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-all.wxs:32779-32780
/CS/trunk/scripts/msi/CS-all.wxs:30048,30643,30699,30960,30988,30998-30999,31001,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-all.wxs:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-all.wxs:32779-32780
/CS/trunk/scripts/msi/CS-all.wxs:30048,30643,30699,30960,30988,30998-30999,31001,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-directory-demo.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-demo.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-demo.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-demo.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-demo.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-demo.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-demo.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-directory-runtime.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-runtime.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-runtime.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-runtime.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-runtime.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-runtime.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-runtime.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-directory-sdk.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-sdk.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-sdk.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-sdk.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-directory-sdk.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-directory-sdk.wxi:32779-32780
/CS/trunk/scripts/msi/CS-directory-sdk.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-feature-demo.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-demo.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-demo.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-demo.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-demo.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-demo.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-demo.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-feature-runtime.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-runtime.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-runtime.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-runtime.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-runtime.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-runtime.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-runtime.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
Property changes on: CS/branches/release/V1.4/scripts/msi/CS-feature-sdk.wxi
___________________________________________________________________
Modified: svn:mergeinfo
- /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-sdk.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-sdk.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-sdk.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937
+ /CS/branches/feature/plugin-merge/scripts/msi/CS-feature-sdk.wxi:31103,31131-31137
/CS/branches/soc2009/postprocessing/scripts/msi/CS-feature-sdk.wxi:32779-32780
/CS/trunk/scripts/msi/CS-feature-sdk.wxi:30048,30643,30699,30960,30988,31070-31072,31076,31083-31085,31087,31090-31092,31138-31139,31247,31254,31257,31264-31265,31279,31313-31315,31328,31344,31501,31543,31545,31547,31568,31606-31609,31622-31625,31630,31632,31634-31635,31639,31641-31646,31722,31730,31763,31767,31779-31783,31819,31821-31823,31827-31829,31831,31834,31841-31842,31903,31905-31906,31908,31911-31914,31935,31949,31951-31952,31955,31958-31959,32015,32018,32037-32039,32041,32055,32087,32109,32139,32148,32155,32380,32387,32390,32393-32394,32448-32452,32455,32470,32529,32531-32535,32537,32544-32549,32609,32612,32623-32624,32684-32685,32691,32695,32698-32700,32702,32704-32706,32708,32714,32783,32790,32795,32833,32859,32870,32873,32879-32881,32937,32941
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|