Vladimír Čunát 97006eb5ed Merge #2638: fix weechat build on darwin ... Conflicts (trivial): pkgs/development/python-modules/pycrypto/default.nix		2014-06-09 19:37:06 +02:00
..
applications	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00
build-support
data
desktops
development	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00
games
misc
os-specific
servers	mysql-connector-java: Bump to version 5.1.31	2014-06-09 19:11:33 +02:00
shells
stdenv
test
tools	tinc: Update from 1.0.23 to 1.0.24	2014-06-09 15:14:05 +02:00
top-level	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00