Shea Levy 7f15b0c132 Merge branch 'xprofile' of git://github.com/pSub/nixpkgs into master ... Allow the user to execute commands at the beginning of the X session. Signed-off-by: Shea Levy <shea@shealevy.com>		2014-01-17 09:28:19 -05:00
doc	manual: Document Java support	2014-01-13 13:15:59 +01:00
lib	connman: new packages ConnMan v1.20 and connman-ui	2014-01-11 20:22:53 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Merge branch 'xprofile' of git://github.com/pSub/nixpkgs into master	2014-01-17 09:28:19 -05:00
pkgs	haskell-hasktags: update to version 0.68.5	2014-01-17 11:59:16 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Next release will be 14.02 Baboon	2013-11-01 09:16:36 +01:00
COPYING
default.nix