granicus.if.org Git - python/commit

]> granicus.if.org Git - python/commit

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 34b345b b19fb24)

author	Benjamin Peterson <benjamin@python.org>
	Tue, 21 Feb 2012 02:44:56 +0000 (21:44 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 21 Feb 2012 02:44:56 +0000 (21:44 -0500)
commit	aee9dfba4a9230f2832dd69d67e92f8e0490a163
tree	27a9896969ac7ff79dc75017cff121a077c3eb6e	tree \| snapshot
parent	34b345b8885e5db8ab6627c081ca86a8b78b6989	commit \| diff
parent	b19fb2462eac776746f6cb40cc84b0587c83b9bc	commit \| diff

merge 2.6 with hash randomization fix

23 files changed:

Doc/library/sys.rst	diff1 \|	diff2 \|	blob \| history
Doc/reference/datamodel.rst	diff1 \|	diff2 \|	blob \| history
Doc/using/cmdline.rst	diff1 \|	diff2 \|	blob \| history
Include/object.h	diff1 \|	diff2 \|	blob \| history
Include/pythonrun.h	diff1 \|	diff2 \|	blob \| history
Lib/os.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_cmd_line.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_hash.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_os.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_set.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_support.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_sys.py	diff1 \|	diff2 \|	blob \| history
Makefile.pre.in	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	diff1 \|	diff2 \|	blob \| history
Misc/python.man	diff1 \|	diff2 \|	blob \| history
Modules/main.c	diff1 \|	diff2 \|	blob \| history
Modules/posixmodule.c	diff1 \|	diff2 \|	blob \| history
Objects/object.c	diff1 \|	diff2 \|	blob \| history
Objects/stringobject.c	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	diff1 \|	diff2 \|	blob \| history
PCbuild/pythoncore.vcproj	diff1 \|	diff2 \|	blob \| history
Python/pythonrun.c	diff1 \|	diff2 \|	blob \| history
Python/sysmodule.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.