Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk ... - 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500		2012-03-31 20:01:40 +00:00
..
amsn	Updating aMSN.	2011-11-14 09:59:26 +00:00
bitlbee	BitlBee 3.0.3.	2011-07-28 12:08:08 +00:00
carrier	Remove some files not reachable from all-packages.nix	2012-03-17 17:20:30 +00:00
centerim	Making 'withGpg' optional in centerim.	2012-01-12 19:00:35 +00:00
ekiga	Move some IM clients to instant-messengers/	2012-03-14 15:41:44 +00:00
freetalk	Adding freetalk	2010-12-29 19:20:55 +00:00
gajim	Update gajim	2010-11-28 13:46:32 +00:00
gtmess	Patching gtmess; it did not build on arm.	2011-11-04 18:10:44 +00:00
kadu	Get kadu to compile with kde48 (as well as kde47).	2012-01-24 00:00:41 +00:00
linphone	Move some IM clients to instant-messengers/	2012-03-14 15:41:44 +00:00
mcabber	Adding mcabber console jabber client - patch by Lluis Batlle	2009-01-04 17:11:38 +00:00
oneteam	Get rid of most references to gtkLibs	2012-03-14 21:57:32 +00:00
pidgin	pidgin-2.10.2	2012-03-17 17:12:48 +00:00
pidgin-plugins	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
psi	Make nixpkgs ready for gst_all attrset removal	2012-03-14 22:44:52 +00:00
skype	Move some IM clients to instant-messengers/	2012-03-14 15:41:44 +00:00
teamspeak	* Get Teamspeak 3 to work. This is the x86_64-linux build, I'll add	2010-10-28 17:45:18 +00:00
telepathy	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
torchat	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
twinkle	Move some IM clients to instant-messengers/	2012-03-14 15:41:44 +00:00
vacuum	Remove obsolete phase	2012-01-18 10:27:48 +00:00