Vladimír Čunát d7abc31f5a fix the last master merge, sorry for the problems ... Now I carefully re-merged all the conflicts and tested some builds. Hopefully it's all OK now.		2013-03-02 22:34:37 +01:00
..
applications	fix the last master merge, sorry for the problems	2013-03-02 22:34:37 +01:00
build-support	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
data
desktops	kde48.okteta: disable parallel build	2013-02-28 09:54:22 +01:00
development	librdf: update the libraries	2013-03-02 15:45:13 +01:00
games	freedink: update and fix	2013-02-28 16:34:19 +01:00
lib	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
misc	Merge branch 'master' into stdenv-updates.	2013-02-25 01:26:26 +01:00
os-specific	fix the last master merge, sorry for the problems	2013-03-02 22:34:37 +01:00
servers	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	stdenv/setup.sh: Always run postPatch hook.	2013-02-27 15:26:18 +01:00
test
tools	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
top-level	ardour(2): fix and minor update.	2013-03-02 21:17:30 +01:00