Vladimír Čunát 7d6cd236c3 merge fixup: conflict of gcc->cc and kde5 StdInc ...

Tarball builds now, so hopefully all is OK.

2015-01-31 22:20:09 +01:00

..

applications

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

build-support

merge fixup: conflict of gcc->cc and kde5 StdInc

2015-01-31 22:20:09 +01:00

data

zeal: new package

2015-01-28 00:02:50 +01:00

desktops

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

development

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

games

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

misc

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

os-specific

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

servers

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

shells

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

stdenv

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

test

…

tools

Merge branch 'master' into staging

2015-01-31 19:34:57 +01:00

top-level

merge fixup: conflict of gcc->cc and kde5 StdInc

2015-01-31 22:20:09 +01:00