nixpkgs/pkgs
Shea Levy c62b5456f5 Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
..
applications Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
build-support cc-wrapper: Set default system include flags for non-gcc c++ on Linux 2015-03-06 19:04:43 +00:00
data Merge remote-tracking branch 'origin/master' into staging. 2015-03-05 12:24:57 +01:00
desktops Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
development Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge 2015-03-06 19:10:10 +00:00
games orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
misc samsung-UnifiedLinuxDriver: fix meta 2015-03-05 20:49:45 +03:00
os-specific Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
servers Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
shells fish: 2.1.1 -> 2.1.2 2015-03-05 01:55:45 +01:00
stdenv Fix eval-release.nix evaluation 2015-03-06 15:09:51 +01:00
test
tools Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
top-level Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge 2015-03-06 19:10:10 +00:00