Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ... Conflicts: pkgs/applications/editors/vim/macvim.nix		2014-11-04 14:30:43 +01:00
..
applications	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
build-support	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
data	Merge pull request #4674 from balajisivaraman/meslo-lg	2014-10-29 16:34:25 +00:00
desktops	Merge remote-tracking branch 'origin/master' into staging.	2014-11-02 16:15:53 +01:00
development	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
games	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
misc	monthly bump of dolphinEmuMaster	2014-11-02 00:11:01 -07:00
os-specific	Merge remote-tracking branch 'origin/master' into staging.	2014-11-02 16:15:53 +01:00
servers	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
test
tools	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
top-level	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00