diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 (GMT) |
| commit | 90540004d3e1cbc0bd5595838bca3d1970198120 (patch) | |
| tree | 9006c98a1c71cf39761d3eb35d4c227540b24947 /PCbuild | |
| parent | c848655eb05c38f9c31bca0df87f2013670a1efa (diff) | |
| download | cpython-90540004d3e1cbc0bd5595838bca3d1970198120.zip cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.gz cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.bz2 | |
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 'PCbuild')
| -rw-r--r-- | PCbuild/pcbuild.sln | 1 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index d534d7e..61090b4 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -29,7 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buil EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}" ProjectSection(SolutionItems) = preProject - ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c readme.txt = readme.txt EndProjectSection EndProject diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index a676600..c2a3b9a 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -1007,6 +1007,10 @@ > </File> <File + RelativePath="..\Modules\_json.c" + > + </File> + <File RelativePath="..\Modules\_localemodule.c" > </File> |