Merged changes in the trunk up to revision 30551.

This commit is contained in:
2010-07-20 19:39:07 +00:00
parent bd68a72869
commit e423e085f8
200 changed files with 20606 additions and 12262 deletions

View File

@@ -634,7 +634,7 @@ static int boxPack_FromPyObject(PyObject * value, boxPack **boxarray )
boxPack *box;
/* Error checking must alredy be done */
/* Error checking must already be done */
if( !PyList_Check( value ) ) {
PyErr_SetString( PyExc_TypeError, "can only back a list of [x,y,x,w]" );
return -1;