Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge recent and iCloud documents correctly #1398

Merged
merged 1 commit into from Feb 18, 2013
Merged

merge recent and iCloud documents correctly #1398

merged 1 commit into from Feb 18, 2013

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Feb 18, 2013

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

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

fixes #1396
@skurfer
Copy link
Member Author

skurfer commented Feb 18, 2013

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

@pjrobertson
Copy link
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
Copy link
Member Author

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 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants