Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +01:00
..
applications	midori: minor update 0.5.6 -> .7	2014-01-23 22:29:25 +01:00
build-support	clang-wrapper: Set $CXX to clang	2014-01-23 11:24:17 +01:00
data	Whitespace fixes in package expressions I maintain	2014-01-02 17:58:08 +01:00
desktops	gnome3: remove librsvg with gtk2	2014-01-21 14:11:20 +01:00
development	Merge master into x-updates	2014-01-23 22:52:18 +01:00
games	Unmaintain a bunch of packages	2014-01-21 22:34:41 -05:00
misc	wineUnstable: update from 1.7.10 to 1.7.11	2014-01-23 21:04:01 +02:00
os-specific	ati-drivers: update to 13.12 (close #1569)	2014-01-23 12:11:28 +01:00
servers	Merge master into x-updates	2014-01-23 22:52:18 +01:00
shells	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
stdenv	stdenv/setup.sh: add .gz extension to links to .gz man pages	2014-01-20 22:11:14 +01:00
test
tools	wget: update from 1.14 to 1.15	2014-01-23 21:10:55 +02:00
top-level	Merge master into x-updates	2014-01-23 22:52:18 +01:00