Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates ... Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix		2012-09-26 14:51:51 -04:00
..
bip
chatzilla
ii	Adding 'ii', irc it.	2012-07-27 22:43:40 +02:00
irssi
konversation	konversation-1.4	2012-08-31 12:07:09 +04:00
quassel
weechat	weechat: update to 0.3.8	2012-07-10 15:56:23 +02:00
xchat	xchat: Fix build with glib-2.32.4	2012-07-15 23:15:21 -04:00