Gabriel Ebner a8d6ad8690 idea: use openjdk8 again		2016-01-23 13:39:15 +01:00
..
applications	idea: use openjdk8 again	2016-01-23 13:39:15 +01:00
build-support	Merge branch 'staging'	2016-01-22 13:48:35 +01:00
data	numix-icon-theme-circle: 20151014 -> 20160121	2016-01-22 14:37:34 +01:00
desktops	gnome3.pomodoro: 3.18-624945d -> 3.18-4844fad	2016-01-22 14:29:28 +01:00
development	openjdk8: do not symlink icc profiles	2016-01-23 13:22:48 +01:00
games	Merge branch 'staging'	2016-01-22 13:48:35 +01:00
misc	Merge pull request #12529 from bendlas/update-wine	2016-01-23 06:43:06 +03:00
os-specific	Merge pull request #12309 from zohl/chromiumos-kernel	2016-01-23 13:13:59 +03:00
servers	Merge pull request #12290 from abbradar/dovecot-updates	2016-01-23 12:02:23 +03:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	heimdall: 1.4.1 -> 1.4.2pre	2016-01-23 04:08:28 +00:00
top-level	Merge pull request #12309 from zohl/chromiumos-kernel	2016-01-23 13:13:59 +03:00