Daniel Peebles f864b95dca Merge pull request #6232 from maun/sdl2 ... Modified SDL2 derivation to work on Mac OSX darwin		2015-02-09 02:01:09 -05:00
..
applications	Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime)	2015-02-08 19:15:09 -05:00
build-support	Merge pull request #6245 from edwtjo/samba-collate-urls	2015-02-08 13:38:01 -08:00
data	symbola: update to 7.19 ; fixes wrong hash.	2015-02-08 20:26:59 +01:00
desktops	e19: updates (close #6003)	2015-02-04 22:20:31 +01:00
development	Merge pull request #6232 from maun/sdl2	2015-02-09 02:01:09 -05:00
games	instead: update from 2.2.1 to 2.2.2	2015-02-07 12:47:42 +01:00
misc	vimplugins: update vim2nix and VAM	2015-02-09 01:43:24 +03:00
os-specific	Pretty sure nothing uses these, since they don't work (and we have a replacement in apple-source-releases)	2015-02-08 23:36:19 -05:00
servers	Merge pull request #6245 from edwtjo/samba-collate-urls	2015-02-08 13:38:01 -08:00
shells	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
stdenv	move libcxx[abi] into llvm tree	2015-02-03 14:58:10 -08:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	iodine: 0.6.0-rc1 -> 0.7.0	2015-02-09 06:41:27 +01:00
top-level	Merge pull request #6232 from maun/sdl2	2015-02-09 02:01:09 -05:00