Arseniy Seroka c8f9a2d76c Merge pull request #7468 from Balletie/master ... Bump SFML to version 2.2, and update MARS game		2015-04-20 19:18:27 +03:00
..
applications	Merge pull request #7415 from bendlas/dropbox	2015-04-20 09:33:48 -05:00
build-support	agda: migrate to haskell-ng, update and cleanup	2015-04-06 21:24:33 +02:00
data	man-pages 3.82 -> 3.83	2015-04-20 15:00:39 +02:00
desktops	e19/rage: fixed sha	2015-04-09 18:40:07 +03:00
development	Merge pull request #7468 from Balletie/master	2015-04-20 19:18:27 +03:00
games	Update SFML to version 2.2, remove sfml_git, and update MARS (depended on sfml_git)	2015-04-20 16:49:39 +02:00
misc	cups-browsed: build with Avahi	2015-04-13 23:21:44 +03:00
os-specific	xf86_input_wacom: update from 0.28.0 to 0.29.0	2015-04-20 14:51:38 +02:00
servers	Merge pull request #6880 from offlinehacker/pkgs/skydns/add	2015-04-19 10:43:05 +02:00
shells	meta.homePage -> homepage	2015-04-20 14:20:03 +02:00
stdenv	Set more precise meta.position for Haskell packages	2015-03-27 16:17:48 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	netsniff-ng v0.5.9-rc4-62-g47a7037 -> v0.5.9-rc4-63-gf43bbe9	2015-04-20 17:17:40 +02:00
top-level	Merge pull request #7468 from Balletie/master	2015-04-20 19:18:27 +03:00