James Cook 3baf1c0772 Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash ... Conflicts: pkgs/tools/networking/ppp/default.nix		2015-02-10 09:24:38 -08:00
..
applications	bluefish: update from 2.2.6 to 2.2.7	2015-02-10 14:03:33 +01:00
build-support	Add Fedora 21	2015-02-10 11:32:43 +01:00
data	symbola: update to 7.19 ; fixes wrong hash.	2015-02-08 20:26:59 +01:00
desktops	e19: updates (close #6003)	2015-02-04 22:20:31 +01:00
development	Merge pull request #6281 from ehmry/nim	2015-02-10 16:08:07 +01:00
games	instead: update from 2.2.1 to 2.2.2	2015-02-07 12:47:42 +01:00
misc	Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS	2015-02-10 14:44:29 +01:00
os-specific	linux_3_{10,12,14}: fix upstream regression, fixes #6231	2015-02-10 13:45:20 +01:00
servers	Merge pull request #6170 from k0ral/sslh	2015-02-10 11:17:56 +01:00
shells	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
stdenv	move libcxx[abi] into llvm tree	2015-02-03 14:58:10 -08:00
test
tools	Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash	2015-02-10 09:24:38 -08:00
top-level	Merge pull request #6281 from ehmry/nim	2015-02-10 16:08:07 +01:00