Eelco Dolstra 6fb27abf33 Merge branch 'java'

2014-01-13 13:16:17 +01:00

..

applications

Merge branch 'java'

2014-01-13 13:16:17 +01:00

build-support

Merge branch 'java'

2014-01-13 13:16:17 +01:00

data

Whitespace fixes in package expressions I maintain

2014-01-02 17:58:08 +01:00

desktops

xfce: add xfce screenshooter

2014-01-13 10:55:18 +00:00

development

Merge branch 'java'

2014-01-13 13:16:17 +01:00

games

Merge pull request #1441 from rszibele/xonotic

2014-01-02 07:50:35 -08:00

misc

wineStable: maintenance update 1.6.1 -> .2, use lcms2

2014-01-11 19:58:16 +01:00

os-specific

remove pointless passthru meta

2014-01-10 01:45:35 +01:00

servers

Merge branch 'java'

2014-01-13 13:16:17 +01:00

shells

dash: enable Hydra builds on Linux

2013-12-21 00:05:38 +01:00

stdenv

Remove non-kernel-specific klibc derivation

2014-01-05 07:38:58 -05:00

test

…

tools

Merge branch 'java'

2014-01-13 13:16:17 +01:00

top-level

Merge branch 'java'

2014-01-13 13:16:17 +01:00