2008-05-07 Marek Habersack <[email protected]>

	* ChangeLog: added and moved entries from ../ChaneLog to here.

	* Makefile (RESOURCE_FILES): partially revert r102022 - always use
	the 3.5.0.0 script library. Fixes bug #384580

svn path=/trunk/mcs/; revision=102715

mcs/class/ChangeLog

@@ -1,13 +1,3 @@
-2008-04-29  Marek Habersack  <[email protected]>
-
-	* System.Web.Extensions/Makefile (EXTRA_DISTFILES): include all
-	the Microsoft AJAX library scripts in the dist tarball.
-
-2008-04-28  Marek Habersack  <[email protected]>
-
-	* System.Web.Extensions/Makefile (RESOURCE_FILES): for the 2.0
-	profile use the 1.0.61025.0 scripts.
-
 2008-04-14  Raja R Harinath  <[email protected]>
 
 	* Makefile (DIST_ONLY_SUBDIRS): Remove.

mcs/class/System.Web.Extensions/ChangeLog

@@ -0,0 +1,17 @@
+2008-05-07  Marek Habersack  <[email protected]>
+
+	* ChangeLog: added and moved entries from ../ChaneLog to here.
+
+	* Makefile (RESOURCE_FILES): partially revert r102022 - always use
+	the 3.5.0.0 script library. Fixes bug #384580
+
+2008-04-29  Marek Habersack  <[email protected]>
+
+	* System.Web.Extensions/Makefile (EXTRA_DISTFILES): include all
+	the Microsoft AJAX library scripts in the dist tarball.
+
+2008-04-28  Marek Habersack  <[email protected]>
+
+	* System.Web.Extensions/Makefile (RESOURCE_FILES): for the 2.0
+	profile use the 1.0.61025.0 scripts.
+

mcs/class/System.Web.Extensions/Makefile

@@ -4,15 +4,6 @@ include ../../build/rules.make
 
 LIBRARY = System.Web.Extensions.dll
 
-ifeq (net_2_0, $(PROFILE))
-RESOURCE_FILES= \
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjax.debug.js	\
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjax.js		\
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxTimer.debug.js	\
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxTimer.js		\
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxWebForms.debug.js\
-	../MicrosoftAjaxLibrary/System.Web.Extensions/1.0.61025.0/MicrosoftAjaxWebForms.js
-else
 RESOURCE_FILES= \
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js	\
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.js		\
@@ -20,7 +11,6 @@ RESOURCE_FILES= \
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxTimer.js		\
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.debug.js\
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjaxWebForms.js
-endif
 
 RESOURCE_FILES_DIST= \
 	../MicrosoftAjaxLibrary/System.Web.Extensions/3.5.0.0/3.5.21022.8/MicrosoftAjax.debug.js	\