Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
analysis
boomerang
build-managers	Add myself (the-kenny) to the maintainer list.	2013-03-30 21:05:15 +01:00
casperjs
cdecl
documentation	Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.	2013-03-23 15:58:14 +01:00
gnulib	gnulib: update to version 0.0-7901-g076ac82	2013-04-06 15:09:25 +02:00
guile
haskell	haskell-hlint: update to version 1.8.44	2013-04-22 14:14:39 +02:00
java
literate-programming/noweb
misc	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
neoload	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
ocaml	Upgrade to 1.0.0	2013-03-15 12:41:01 +01:00
parsing	Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.	2013-03-23 15:58:14 +01:00
phantomjs
profiling
pydb
selenium