Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge from 3.3.

This commit is contained in:
Stefan Krah 2014-01-20 15:35:38 +01:00
parent 5a6d4bf671 6c01e38677
commit 34e4628453
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -562,6 +562,7 @@ Randall Hopper
Nadav Horesh
Alon Horev
Jan Hosang
Alan Hourihane
Ken Howard
Brad Howes
Mike Hoy

3
Python/fileutils.c
View File

@ -1,11 +1,12 @@
#include "Python.h"
#include "osdefs.h"
#include <locale.h>
#ifdef MS_WINDOWS
# include <windows.h>
#endif
#ifdef HAVE_LANGINFO_H
#include <locale.h>
#include <langinfo.h>
#endif