Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
..
audio	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
display-managers	slim: Work around broken PAM session handling	2013-10-15 13:23:40 +02:00
editors	ess-mode: update to version 13.09	2013-12-03 12:44:52 +01:00
graphics	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
ike	add ike: IPSec client	2013-10-18 18:50:53 +02:00
misc	Add robomongo, a GUI for exploring mongodb data and building queries.	2013-12-06 19:40:40 +01:00
networking	Merge pull request #1338 from ktosiek/quassel	2013-12-07 00:04:14 -08:00
office	Ledger3: Update to latest git.	2013-11-27 01:53:06 +01:00
science	xplanet: fix build against giflib 5.*	2013-12-07 13:13:06 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	hg 2.8.1	2013-12-06 08:34:44 -05:00
video	keymon: update from 1.13 to 1.16	2013-12-04 06:44:19 +02:00
virtualization	Minor changes to Bochs expression.	2013-11-24 16:30:16 +01:00
window-managers	weston: clean the expression (no semantic change)	2013-11-23 23:56:38 +01:00