Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
analysis	splint: improve meta attributes	2013-08-06 21:20:47 +02:00
boomerang
build-managers	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
casperjs
cdecl
documentation	haskell-haddock: add version 2.13.2.1	2013-06-13 10:43:35 +02:00
gnulib	gnulib: update to version v0.0-7952-g439b0e9	2013-06-05 22:16:24 +02:00
guile
haskell	haskell-cabal2nix: update to version 1.53	2013-08-11 23:50:04 +02:00
java
jq	Adding jq JSON processor	2013-05-20 11:17:20 +04:00
literate-programming/noweb
misc	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
neoload	neoload: upgrade to 4.1.3	2013-06-04 07:50:59 +02:00
ocaml	ocamlPackages.deriving: fix version	2013-06-19 03:20:00 +03:00
parsing	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
phantomjs
profiling	oprofile: fix via minor update	2013-02-23 23:49:48 +01:00
pydb
selenium	Chromedriver: update to 2.0	2013-06-20 09:21:25 -04:00