nixpkgs/pkgs
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
..
applications svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
build-support Removing usernixos from nixpkgs trunk. 2012-03-28 20:18:56 +00:00
data svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
desktops Fix gnome-doc-utils 2012-03-31 19:50:54 +00:00
development svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
games Merge ^/nixpkgs/trunk. 2012-03-28 15:42:42 +00:00
lib Adding tp_smapi. 2012-03-31 13:40:34 +00:00
misc Adding meta to busybox, and setting me as maintainer, and asking hydra to build it. 2012-03-27 22:05:03 +00:00
os-specific Adding tp_smapi. 2012-03-31 13:40:34 +00:00
servers svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
shells * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
stdenv Add `stdenv.isGNU'. 2012-03-06 21:33:14 +00:00
test
tools svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
top-level svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00