Joachim F ddd8dc072e Merge pull request #29255 from orivej/aseprite ... aseprite: 0.9.5 -> 1.1.7		2017-09-12 22:37:22 +00:00
..
applications	Merge pull request #29255 from orivej/aseprite	2017-09-12 22:37:22 +00:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2017-09-11 22:52:53 +02:00
common-updater
data	Merge pull request #28964 from chrisburr/patch-2	2017-09-12 09:42:33 +01:00
desktops	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
development	kyotocabinet: fix darwin build	2017-09-12 22:13:58 +02:00
games	scorched3d: fixing build with gcc6	2017-09-08 15:08:00 +02:00
misc	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
os-specific	Merge pull request #29270 from rnhmjoj/btfs	2017-09-12 22:35:38 +00:00
servers	nginx: disable pie on darwin	2017-09-12 22:42:04 +02:00
shells
stdenv	stdenv bootstrap: fix evaluation	2017-09-10 11:16:47 +02:00
test	nixpkgs-tests: add basic test for buildInputs	2017-09-10 22:49:47 +02:00
tools	Merge pull request #29268 from rnhmjoj/pirate-get	2017-09-12 22:34:47 +00:00
top-level	Merge pull request #29255 from orivej/aseprite	2017-09-12 22:37:22 +00:00