[phobos] [D-Programming-Language/phobos] db5b27: Merge branch 'jmdavis-red-black'

Jonathan M Davis jmdavisProg at gmx.com
Sat Feb 26 17:59:59 PST 2011


On Saturday 26 February 2011 17:22:47 noreply at github.com wrote:
> Branch: refs/heads/master
> Home:   https://github.com/D-Programming-Language/phobos
> 
> Commit: db5b27dcd20a367e89b36cf912ea0dd96c739b82
>    
> https://github.com/D-Programming-Language/phobos/commit/db5b27dcd20a367e89
> b36cf912ea0dd96c739b82 Author: Andrei Alexandrescu <andrei at erdani.com>
> Date:   2011-02-26 (Sat, 26 Feb 2011)
> 
> Changed paths:
>   R std/array.d
>   M std/container.d
>   M win32.mak
> 
> Log Message:
> -----------
> Merge branch 'jmdavis-red-black'
> 
> Conflicts:
> 	std/array.d
> 
> 
> Commit: f6c8566517054acdd246df0d67ab51e9b1fb3780
>    
> https://github.com/D-Programming-Language/phobos/commit/f6c8566517054acdd2
> 46df0d67ab51e9b1fb3780 Author: Andrei Alexandrescu <andrei at erdani.com>
> Date:   2011-02-26 (Sat, 26 Feb 2011)
> 
> Log Message:
> -----------
> Merge branch 'red-black' of https://github.com/jmdavis/phobos
> 
> 
> Commit: 31d47df17fc77a5a16e4e51267eaa6952ba01213
>    
> https://github.com/D-Programming-Language/phobos/commit/31d47df17fc77a5a16
> e4e51267eaa6952ba01213 Author: Andrei Alexandrescu <andrei at erdani.com>
> Date:   2011-02-26 (Sat, 26 Feb 2011)
> 
> Changed paths:
>   A std/array.d
> 
> Log Message:
> -----------
> readded std/array.d

Well, that's mean of it. It treated those changes like std.array had been 
completed removed and re-added. That makes it rather hard to see any changes.

- Jonathan M Davis


More information about the phobos mailing list