Vladimír Čunát 6445ac90ad Merge master into x-updates		2014-04-01 10:49:31 +02:00
..
applications	chromium: Fix build of stable channel.	2014-04-01 04:01:58 +02:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +01:00
data
desktops	gtk+3 core stack: update to 3.12	2014-03-27 20:53:50 +01:00
development	Merge master into x-updates	2014-04-01 10:49:31 +02:00
games	Merge master into x-updates	2014-04-01 10:49:31 +02:00
misc
os-specific	Add linux 3.14	2014-03-31 20:54:47 -04:00
servers	Merge master into x-updates	2014-04-01 10:49:31 +02:00
shells
stdenv
test
tools	Merge branch 'ccid' of git://github.com/ambrop72/nixpkgs	2014-03-31 21:00:15 -04:00
top-level	Merge master into x-updates	2014-04-01 10:49:31 +02:00