Vincent Laporte e2db82874c Updates merlin to 1.7.1		2014-08-22 14:56:33 +02:00
..
applications	Merge pull request #3640 from Fuuzetsu/tesseract-jpn	2014-08-19 17:47:16 +02:00
build-support	cabal: enable multi-threaded builds with GHC 7.8.x or later	2014-08-17 00:20:12 +02:00
data	man-pages: Update to 3.70	2014-08-19 11:46:08 +02:00
desktops	gpaste: new package	2014-08-14 21:16:42 +02:00
development	Updates merlin to 1.7.1	2014-08-22 14:56:33 +02:00
games	update minecraft-server to 1.7.10	2014-08-18 18:51:51 -07: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	Merge pull request #3658 from cstrahan/xquartz-cleanup	2014-08-18 16:17:23 -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	tmux: Install bash completion script.	2014-08-19 17:03:49 +02:00
top-level	Merge pull request #3667 from rrnewton/manticore	2014-08-19 17:18:52 +02:00