Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
atari++
atari800	atari800: update from 2.0.2 to 2.2.1	2013-12-18 18:18:17 +02:00
bsod
darcnes
dlx
dosbox
fakenes
gens-gs
hatari
mess
mupen64plus
retroarch	retroarch: update to 0.9.9.7	2013-12-26 18:55:17 +01:00
uae
vice
VisualBoyAdvance	Mark more packages as broken	2013-11-04 21:11:00 +01:00
wine	Merge master into x-updates	2013-12-18 23:21:29 +01:00
wxmupen64plus
zsnes