mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
Merge branch 'master' of ssh://github.com/gnustep/libs-base
Conflicts: Source/GSAttributedString.m
This commit is contained in:
commit
4a7325b00e
1 changed files with 2 additions and 2 deletions
|
@ -684,7 +684,7 @@ SANITY();
|
|||
unsigned arrayIndex = 0;
|
||||
unsigned arraySize;
|
||||
// Initial value unused; set by _attributesAtIndexEffectiveRange
|
||||
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
|
||||
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
|
||||
unsigned afterRangeLoc, beginRangeLoc;
|
||||
NSDictionary *attrs;
|
||||
NSZone *z = [self zone];
|
||||
|
@ -797,7 +797,7 @@ SANITY();
|
|||
unsigned arrayIndex = 0;
|
||||
unsigned arraySize;
|
||||
// Initial value unused; set by _attributesAtIndexEffectiveRange
|
||||
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
|
||||
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
|
||||
GSAttrInfo *info;
|
||||
int moveLocations;
|
||||
unsigned start;
|
||||
|
|
Loading…
Reference in a new issue