merge bugfix from trunk

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/base-1_13_0@24146 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-11-21 17:05:51 +00:00
parent aa2ba541e7
commit 60a3aa3d10
2 changed files with 6 additions and 2 deletions

View file

@ -1,4 +1,8 @@
2006-11-28 Richard Frith-Macdonald <rfm@gnu.org>
2006-11-21 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m: merge bbugfix from trunk.
2006-11-18 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSCalendarDate.m:
* Source/NSPropertyList.m:

View file

@ -1389,7 +1389,7 @@ static unsigned urlAlign;
[loop runMode: NSDefaultRunLoopMode beforeDate: future];
}
}
data = [handle resourceData];
data = [handle availableResourceData];
return data;
}