Vladimír Čunát 26d68ce798 merge #3301: add Adom game (with fixes)		2014-08-18 16:26:39 +02:00
..
applications	Update dropbox	2014-08-17 23:06:51 -04:00
build-support	cabal: enable multi-threaded builds with GHC 7.8.x or later	2014-08-17 00:20:12 +02:00
data	Merge pull request #3211 from ttuegel/adobe-fonts	2014-08-08 21:52:59 +02:00
desktops	gpaste: new package	2014-08-14 21:16:42 +02:00
development	inotify-tools: update from 3.13 to 3.14 and add myself to maintainers	2014-08-17 23:13:12 +02:00
games	merge #3301: add Adom game (with fixes)	2014-08-18 16:26:39 +02:00
misc	Vim-plugins: add vim-pathogen	2014-08-15 19:45:32 +02:00
os-specific	linux: Enable ACLs in ext3	2014-08-18 14:33:09 +02:00
servers	nginx: 1.6.0 -> 1.6.1	2014-08-17 06:35:40 -05:00
shells	Merge 'staging' into master	2014-08-08 20:13:23 +02:00
stdenv	Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval	2014-08-12 20:18:10 +02:00
test
tools	nixUnstable: Update to 1.8pre3746_c160ead	2014-08-17 21:50:22 +02:00
top-level	merge #3301: add Adom game (with fixes)	2014-08-18 16:26:39 +02:00