Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
abiword	abiword: add to channel	2014-06-23 12:54:46 +02:00
antiword
basket
calligra
eventlist	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnucash	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnumeric	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
hledger-interest	Add "please don't edit" comment at the top of every auto-generated Haskell file.	2014-07-14 13:21:41 +02:00
hledger-irr	Add "please don't edit" comment at the top of every auto-generated Haskell file.	2014-07-14 13:21:41 +02:00
homebank	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
impressive	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
kbibtex
keepnote	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
kmymoney
ledger
libreoffice	Do not create unneeded local-scope packages; disable a failing test	2014-06-28 23:33:42 +04:00
mmex	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
scribus	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
skrooge
todo.txt-cli
zanshin
zotero	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00