nixpkgs/pkgs/applications/office/zotero
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
..
firefox-bin rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
default.nix zotero: build standalone from cross-platform XPI with latest firefox 2015-01-24 13:42:19 -06:00
zotero.sh zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:49:34 -06:00