Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
analysis	* Doh.	2009-09-23 19:50:31 +00:00
build-managers	Big fixes in the cross build:	2009-11-22 19:51:45 +00:00
cdecl	Making cdecl compile with readline.	2009-04-08 10:09:14 +00:00
documentation	Updating doxygen from 1.5.8 to 1.6.1	2009-11-04 14:58:39 +00:00
guile	G-Wrap 1.9.13.	2009-10-29 11:23:10 +00:00
haskell	Version bumps for a number of Haskell packages.	2009-09-14 08:35:39 +00:00
java	Add FastJar.	2009-07-27 10:43:20 +00:00
literate-programming/noweb	* Get rid of all references to nix.cs.uu.nl.	2008-11-14 16:57:19 +00:00
misc	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
ocaml/camlp5	Updated Coq to version 8.2pl1	2009-11-02 11:44:27 +00:00
parsing	- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining	2009-11-19 19:03:34 +00:00
profiling	* Improved a bunch of "name" attributes (mostly missing version	2009-10-28 14:06:56 +00:00
selenium/remote-control	downgrade selenium-rc to rev 2450. The newer one is buggy (Neither allows using a FirefoxProfile nor launches Opera)	2009-04-14 12:58:53 +00:00