Skip to content

Commit

Permalink
Merge branch '2.065'
Browse files Browse the repository at this point in the history
Conflicts:
	posix.mak
  • Loading branch information
AndrewEdwards committed Jan 15, 2014
2 parents aa67b76 + 55c83ed commit 9bcb99f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions std/zip.d
Expand Up @@ -99,6 +99,11 @@ final class ArchiveMember
@property ref inout(ushort) madeVersion() inout @safe pure nothrow
{ return _madeVersion; }

// Explicitly undocumented. It will be removed in January 2015.
deprecated("Please use fileAttributes instead.")
@property ref inout(ushort) madeVersion() inout @safe pure nothrow
{ return _madeVersion; }

// Explicitly undocumented. It will be removed in January 2015.
deprecated("Please use fileAttributes instead.")
@property ref inout(uint) externalAttributes() inout @safe pure nothrow
Expand Down

4 comments on commit 9bcb99f

@9rnsr
Copy link
Contributor

@9rnsr 9rnsr commented on 9bcb99f Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is currently only on release branch.
Let's merge master branch to release.

@AndrewEdwards
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just took a look at master and this commit is there. Check out lines 99-104.

@9rnsr
Copy link
Contributor

@9rnsr 9rnsr commented on 9bcb99f Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit appears in:
https://github.com/D-Programming-Language/phobos/commits/release

But doesn't in:
https://github.com/D-Programming-Language/phobos/commits/master

Maybe your local master is not yet pushed to github?

@AndrewEdwards
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You were right. I did not push my local master. Should be taken care of now.

Please sign in to comment.