diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 +0000 |
| commit | 90540004d3e1cbc0bd5595838bca3d1970198120 (patch) | |
| tree | 9006c98a1c71cf39761d3eb35d4c227540b24947 /PC/VC6/pythoncore.dsp | |
| parent | c848655eb05c38f9c31bca0df87f2013670a1efa (diff) | |
| download | cpython-git-90540004d3e1cbc0bd5595838bca3d1970198120.tar.gz | |
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
........
Diffstat (limited to 'PC/VC6/pythoncore.dsp')
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 969e9df012..9a369f2c58 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -145,6 +145,10 @@ SOURCE=..\..\Modules\_heapqmodule.c # End Source File
# Begin Source File
+SOURCE=..\..\Modules\_json.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\_localemodule.c
# End Source File
# Begin Source File
|