Michael Raskin 2991b5a2f3 Merge pull request #3529 from AndersonTorres/bochs ... Bochs: update to version 2.6.6		2014-08-23 12:48:05 +04:00
..
applications	Merge pull request #3529 from AndersonTorres/bochs	2014-08-23 12:48:05 +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	man-pages: Update to 3.70	2014-08-19 11:46:08 +02:00
desktops	gdm-3.12: disable parallel building	2014-08-19 18:36:06 +02:00
development	Adds javalib and sawja	2014-08-23 12:44:16 +04:00
games	Update The Buttefly Effect game	2014-08-22 21:34:28 +04:00
misc	Vim-plugins: add vim-pathogen	2014-08-15 19:45:32 +02:00
os-specific	Fix various evaluation problems	2014-08-22 11:57:40 +02:00
servers	Add mlmmj package and nixos module.	2014-08-23 12:30:45 +04: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	Merge pull request #3514 from deepfire/chntpw	2014-08-23 12:47:17 +04:00
top-level	Merge pull request #3529 from AndersonTorres/bochs	2014-08-23 12:48:05 +04:00