Edward Tjörnhammar 649d6a6b71 Merge pull request #7687 from joachifm/freemind-1_0_1 ... freemind: 0.9.0 -> 1.0.1		2015-05-04 17:02:50 +02:00
..
applications	Merge pull request #7687 from joachifm/freemind-1_0_1	2015-05-04 17:02:50 +02:00
build-support	fetchhg: pass proxyvars to hg	2015-04-28 22:44:57 +02:00
data	Added Font Awesome TTF font.	2015-05-03 14:55:04 +02:00
desktops	meta.description fixups	2015-04-30 18:17:42 +02:00
development	haskell-doctest-prop: disable broken test suite	2015-05-04 15:51:58 +02:00
games	hedgewars: convert the build to Haskell NG	2015-05-04 12:43:24 +02:00
misc	vim-plugins: wakatime 3.0.9 -> 4.0.0	2015-05-03 22:29:14 +02:00
os-specific	add support for pam_u2f to nixos pam module	2015-05-03 19:22:00 +01:00
servers	Merge pull request #7657 from teh/master	2015-05-03 21:57:52 +02:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	useGoldLinker: Fix appending to $NIX_CFLAGS_LINK	2015-05-04 14:00:45 +02:00
test
tools	Merge branch 'master' into fix/ansible-ec2	2015-05-04 08:57:57 +02:00
top-level	Merge pull request #7687 from joachifm/freemind-1_0_1	2015-05-04 17:02:50 +02:00