Skip to content
Commit 7e0b78f7 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge master into x-updates 

Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
parents 29a878d1 12235ed3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment