3 Commits

Author	SHA1	Message	Date
Vladimír Čunát	88c9f8b574	xlibs: replace occurrences by xorg ... This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.	2015-09-15 12:54:34 +02:00
Vladimír Čunát	dbae4f109f	Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix	2015-01-31 19:34:57 +01:00
Matej Cotman	617d11be2b	nodewebkit: add 0.11.2	2015-01-22 05:19:06 +01:00