philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Lluís Batlle i Rossell 17876de2c5 Updating from trunk. 
Many property change come, all on merge info, because those files have explicit merge info
in trunk already.
It is a problem in trunk, not in stdenv-updates. Every time we will update from trunk, the explcit merge info for these files will be updated.


svn path=/nixpkgs/branches/stdenv-updates2/; revision=18274
2009-11-08 00:40:07 +00:00
..
applications Updating from trunk. 2009-11-08 00:40:07 +00:00
build-support Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
configs/etc
data pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix: added docbook 4.5 XML DTD 2009-11-03 15:57:27 +00:00
desktops Fix gnome-doc-utils 2009-11-07 09:34:12 +00:00
development Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
games Fixing a problem in the neverball build about paths, that I did not notice until 2009-11-06 19:25:54 +00:00
lib * Fix typo and clarify why you should not use "mkFixStrictness" on top of 2009-11-07 16:24:11 +00:00
misc Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
os-specific Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
servers Updating the xorg dri path patch for dri2. 2009-11-06 21:15:59 +00:00
shells Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
stdenv Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
test
tools Porting changes from stdenv-updates into this branch. 2009-11-08 00:32:12 +00:00
top-level Updating from trunk. 2009-11-08 00:40:07 +00:00