Florian Friesdorf 471a4b583f Merge branch 'channel-nixos' into python-merge		2012-11-29 15:36:17 +01:00
..
applications	Merge branch 'channel-nixos' into python-merge	2012-11-29 15:36:17 +01:00
build-support	Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way	2012-11-25 23:57:49 +04:00
data	man-pages: update to version 3.43	2012-11-05 11:42:05 +01:00
desktops
development	Merge branch 'channel-nixos' into python-merge	2012-11-29 15:36:17 +01:00
games	World of Goo 1.41.	2012-11-28 14:38:46 -08:00
lib	Update e-mail address	2012-11-26 14:49:05 +01:00
misc	SANE: switch snapshot version of the backends to git (and general cleanup)	2012-11-26 16:18:05 +01:00
os-specific	Need pthread_cancel for zdb to work properly. Add -lgcc_s.	2012-11-26 21:32:24 -08:00
servers	Merge pull request #153 from jcumming/icecast	2012-11-21 21:30:28 -08:00
shells
stdenv
test
tools	Add 'connect' for traversing SOCKS proxies	2012-11-28 14:29:11 -08:00
top-level	Merge branch 'channel-nixos' into python-merge	2012-11-29 15:36:17 +01:00