Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk ... - 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500		2012-03-31 20:01:40 +00:00
..
compilers	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
eclipse	update ecj version	2010-11-22 14:50:52 +00:00
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	mkDerivation handles propagatedUserEnvPkgs properly now	2012-03-27 15:20:37 +00:00
libraries	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
misc	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
ocaml-modules	Updating hash for ocaml_sqlite3	2012-03-25 21:24:23 +00:00
perl-modules	Remove some files not reachable from all-packages.nix	2012-03-17 17:20:30 +00:00
python-modules	Revert "python site.py that loads pth files anywhere on PYTHONPATH"	2012-02-28 00:08:00 +00:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tools	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
web	svn merge ^/nixpkgs/trunk	2012-03-05 10:00:23 +00:00