Moritz Ulrich f49becb7a6 Merge branch 'master' into dropbox-py ... Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de> Conflicts: pkgs/top-level/all-packages.nix		2013-04-04 00:18:48 +02:00
..
audio	mopidy: Update to 0.12.0	2013-04-02 15:53:57 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	Merge pull request #407 from maggesi/proofgeneral_updates	2013-03-25 03:33:21 -07:00
graphics	darktable: Add 1.2-RC1 as darktable12	2013-04-02 15:53:57 +02:00
misc	update meta.maintainers section	2013-04-01 18:44:33 +02:00
networking	Merge branch 'master' into dropbox-py	2013-04-04 00:18:48 +02:00
office	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
science	kicad: upgrade to stable version 20130325, libraries to r220	2013-03-31 19:17:02 -07:00
search/recoll	fix recoll filters, enable inotify support.	2013-04-01 22:59:22 -07:00
taxes	add dutch tax application for 2012	2013-03-22 00:00:04 +01:00
version-management	tig: enable bash completion	2013-04-01 18:37:52 +02:00
video	xbmc: add pulse support, lame, avahi, libdvdcss	2013-04-01 17:13:00 +02:00
virtualization	Partially revert my recent kernelPackages changes	2013-03-24 07:45:00 -04:00
window-managers	fixed typo from previous commit	2013-03-29 18:28:11 +01:00