Yury G. Kudryashov 571365c5bd Merge trunk into branches/libpng15. No conflicts. ... svn path=/nixpkgs/branches/libpng15/; revision=30917		2011-12-15 20:14:55 +00:00
..
applications	xournal: prepare to poppler upgrade	2011-12-15 08:01:03 +00:00
build-support	Dir-per-version SF layout seems to be more relevant now	2011-12-13 21:00:26 +00:00
data	Allow cross-builds	2011-12-03 09:07:56 +00:00
desktops	desktops/e17: Updated everything.	2011-12-10 18:11:37 +00:00
development	Merge trunk into branches/libpng15. No conflicts.	2011-12-15 20:14:55 +00:00
games	spring: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion)	2011-12-11 18:35:23 +00:00
lib	Add mornfall as a maintainer	2011-12-03 22:05:21 +00:00
misc	Merge trunk into branches/libpng15. No conflicts.	2011-12-15 20:14:55 +00:00
os-specific	Revert cryptsetup update to version 1.4.1.	2011-12-14 10:42:49 +00:00
servers	Upgrading CouchDB to 1.1.1 with SpiderMonkey 185	2011-12-15 12:24:25 +00:00
shells	synchronize with trunk	2011-10-18 08:47:36 +00:00
stdenv	* /bin and /usr/bin are the same on OpenSolaris so the	2011-11-21 14:55:58 +00:00
test
tools	pdf2djvu-0.7.11	2011-12-14 18:58:12 +00:00
top-level	haskell-network: updated to version 2.3.0.8	2011-12-15 13:36:58 +00:00