merge recent and iCloud documents correctly #1398

Merged
merged 1 commit into from Feb 18, 2013

Conversation

Projects
None yet
2 participants
@skurfer
Member

skurfer commented Feb 18, 2013

It was mixing file paths with QSObjects. Now it combines two arrays of QSObjects.

merge recent and iCloud documents correctly
It was mixing file paths with QSObjects. Now it combines two arrays of QSObjects.

fixes #1396
@skurfer

This comment has been minimized.

Show comment Hide comment
@skurfer

skurfer Feb 18, 2013

Member

That should have been against release. I'll merge it there manually once it goes into master.

Member

skurfer commented Feb 18, 2013

That should have been against release. I'll merge it there manually once it goes into master.

@pjrobertson

This comment has been minimized.

Show comment Hide comment
@pjrobertson

pjrobertson Feb 18, 2013

Member

Eventhough this has been around in ß71, we should really put this in release right?
Wanna change the base branch?

Go ahead and merge when done :)

P.S. don't listen to me! ;-)

Member

pjrobertson commented Feb 18, 2013

Eventhough this has been around in ß71, we should really put this in release right?
Wanna change the base branch?

Go ahead and merge when done :)

P.S. don't listen to me! ;-)

@skurfer

This comment has been minimized.

Show comment Hide comment
@skurfer

skurfer Feb 18, 2013

Member

Eventhough this has been around in ß71, we should really put this in release right?

Yeah. I commented on that above. But I can't change it without reopening this, right? Not necessary. I'll just do it manually. :-)

Member

skurfer commented Feb 18, 2013

Eventhough this has been around in ß71, we should really put this in release right?

Yeah. I commented on that above. But I can't change it without reopening this, right? Not necessary. I'll just do it manually. :-)

@skurfer skurfer merged commit 0666722 into quicksilver:master Feb 18, 2013

@skurfer skurfer deleted the skurfer:appChildren branch Feb 18, 2013

skurfer added a commit that referenced this pull request Feb 18, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment