comparison PC/VC6/pythoncore.dsp @ 46737:9f45979558a9

Merged revisions 62734,62736,62748,62769 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines Fix JSON module docs. ........ r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines PEP 8 nits in json package ........ r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines Intern static string Use float constructors instead of magic code for float constants ........
author Christian Heimes <christian@cheimes.de>
date Thu, 08 May 2008 14:29:10 +0000
parents b69f443ef480
children 1546c1fb8f82
comparison
equal deleted inserted replaced
46734:cef5aa3ed713 46737:9f45979558a9
143 143
144 SOURCE=..\..\Modules\_heapqmodule.c 144 SOURCE=..\..\Modules\_heapqmodule.c
145 # End Source File 145 # End Source File
146 # Begin Source File 146 # Begin Source File
147 147
148 SOURCE=..\..\Modules\_json.c
149 # End Source File
150 # Begin Source File
151
148 SOURCE=..\..\Modules\_localemodule.c 152 SOURCE=..\..\Modules\_localemodule.c
149 # End Source File 153 # End Source File
150 # Begin Source File 154 # Begin Source File
151 155
152 SOURCE=..\..\Modules\_lsprof.c 156 SOURCE=..\..\Modules\_lsprof.c