Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04:00
..
audio	pianobar: Change license and clean up code	2013-06-08 14:13:36 -05:00
display-managers
editors	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
graphics	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
misc	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
networking	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
office	Revert "Fixing LibreOffice configure for now"	2013-06-05 22:51:21 +02:00
science	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00: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	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
video	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00