Alexander Foremny 7cc6e0b379 Merge remote-tracking branch 'upstream/master' into haskell-ListZipper		2012-10-24 13:25:53 +02:00
..
applications	Merge pull request #157 from ecarreras/virtualbox-icons	2012-10-23 10:42:28 -07:00
build-support	Remove deprecated option --ephemeral from fetchdarcs	2012-10-22 15:02:33 +02:00
data
desktops	Fix waf env python to ${python}/bin/python	2012-10-23 19:40:46 +02:00
development	Merge remote-tracking branch 'upstream/master' into haskell-ListZipper	2012-10-24 13:25:53 +02:00
games	Update sgt-puzzles	2012-10-18 00:21:42 +04:00
lib	Make Firefox 16 the default	2012-10-23 15:35:48 +02:00
misc	jackaudio: Add extra download URL. Main site seems down.	2012-10-18 14:17:21 +02:00
os-specific	Merge pull request #140 from MarcWeber/fixes/ati-proprietary	2012-10-23 11:54:56 -07:00
servers	Fix xwd build	2012-10-19 13:50:02 +04:00
shells	bash-completion: remove NixOS-specific patch	2012-10-16 18:26:02 +02:00
stdenv
test
tools	asciidoc: update to version 8.6.8	2012-10-23 19:48:51 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into haskell-ListZipper	2012-10-24 13:25:53 +02:00