Rommel M. Martinez 8eeca92e92 Merge remote-tracking branch 'upstream/master'		2013-04-02 11:40:29 +08:00
..
applications	Merge pull request #427 from mpashton/mpa	2013-04-01 11:05:51 -07:00
build-support
data
desktops
development	Merge remote-tracking branch 'upstream/master'	2013-04-02 11:40:29 +08:00
games
lib
misc
os-specific
servers	Merge branch 'lighttpd' of git://github.com/bjornfor/nixpkgs into upstream-master	2013-04-01 13:06:03 -04:00
shells
stdenv
test
tools	tmux: update to version 1.8	2013-04-01 16:24:08 -06:00
top-level	flexget: run time dependency on deluge (plugin)	2013-04-01 22:55:33 +02:00