Merge CPackRPM changes into doc-spelling

Conflicts:
	Modules/CPackRPM.cmake
This commit is contained in:
Brad King
2010-07-13 09:46:52 -04:00
19 changed files with 246 additions and 238 deletions

View File

@@ -454,7 +454,7 @@ int cmcompress_compress(struct cmcompress_stream* cdata, void* buff, size_t n)
{
goto nomatch;
}
disp = cdata->hsize_reg - i; /* secondary hash (after G. Knott) */
disp = (int)(cdata->hsize_reg - i); /* secondary hash (after G. Knott) */
if ( i == 0 )
{
disp = 1;