Vladimír Čunát 089da3ee5c Merge master into x-updates ... Conflicts (simple): pkgs/top-level/all-packages.nix		2013-12-10 13:00:02 +01:00
..
applications	Merge master into x-updates	2013-12-10 13:00:02 +01:00
build-support	Fix nix-prefetch-git	2013-11-24 14:03:34 +01:00
data	shared_mime_info: update from 1.1 to 1.2	2013-12-04 06:53:44 +02:00
desktops	Merge master into x-updates	2013-12-10 13:00:02 +01:00
development	Merge master into x-updates	2013-12-10 13:00:02 +01:00
games	springLobby: update from 0.176 to 0.180	2013-12-09 10:58:16 +02:00
misc	winetricks: Update to rev 1078	2013-12-09 00:34:35 +00:00
os-specific	Linux 3.12.4	2013-12-09 12:01:37 -05:00
servers	Merge master into x-updates	2013-12-10 13:00:02 +01:00
shells	fish: Update to 2.1.0 (close #1261)	2013-11-23 11:09:09 +01:00
stdenv	mkDerivation: Set meta.position to the source file of the derivation	2013-11-19 14:58:47 +01:00
test
tools	Merge master into x-updates	2013-12-10 13:00:02 +01:00
top-level	Merge master into x-updates	2013-12-10 13:00:02 +01:00