From: <ms...@us...> - 2010-09-24 13:21:38
|
Revision: 11357 http://wonder.svn.sourceforge.net/wonder/?rev=11357&view=rev Author: mschrag Date: 2010-09-24 13:21:32 +0000 (Fri, 24 Sep 2010) Log Message: ----------- get rid of the stupid mergeinfo on the random ajax and erworkerchannel folder Property Changed: ---------------- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder:11280-11354 + /trunk/Wonder:11280-11356 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel:11280-11354* Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java:11280-11354 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java:11280-11354 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |