lethalman 174184ccc1 Merge pull request #5621 from prikhi/add-workrave ... Add Workrave, an RSI prevention app		2015-01-08 14:41:29 +01:00
..
applications	Merge pull request #5621 from prikhi/add-workrave	2015-01-08 14:41:29 +01:00
build-support	java: Normalize to the default jre / jdk	2015-01-07 14:55:41 -08:00
data	include version number in name	2014-12-20 14:45:26 +00:00
desktops	gnome-shell: add missing sqlite needed by libcamel	2015-01-08 12:34:12 +01:00
development	Merge pull request #5621 from prikhi/add-workrave	2015-01-08 14:41:29 +01:00
games	Merge pull request #5518 from tomberek/patch-1	2015-01-08 02:56:23 -06:00
misc	Merge pull request #5592 from AndersonTorres/fsuae	2015-01-06 09:59:56 +00:00
os-specific	Merge pull request #5603 from abbradar/iwlwifi	2015-01-08 01:53:21 +01:00
servers	Merge pull request #5618 from flosse/prosody-update	2015-01-08 01:52:50 +01:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	restore pkgs.gcc = stdenv.cc	2015-01-03 09:54:02 -05:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge pull request #5613 from spwhitt/dtrx	2015-01-08 13:30:08 +01:00
top-level	Merge pull request #5621 from prikhi/add-workrave	2015-01-08 14:41:29 +01:00