Pascal Wittmann 95b4d2af94 Merge pull request #3934 from MP2E/chocolate-doom ... chocolateDoom and chocolateDoomMaster added		2014-09-09 12:16:18 +02:00
..
applications	Revert "fixes #1923"	2014-09-09 12:11:53 +02:00
build-support	grsecurity: Update stable and test patches	2014-09-08 15:16:38 +02:00
data	shared_mime_info: update from 1.2 to 1.3	2014-09-06 19:02:27 +02:00
desktops	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
development	jenkins: update to latest (v1.579)	2014-09-08 17:08:05 +02:00
games	Merge pull request #3934 from MP2E/chocolate-doom	2014-09-09 12:16:18 +02:00
misc	libretro-cores:	2014-09-04 20:03:13 +02:00
os-specific	linux: Update to 3.12.28	2014-09-08 15:49:27 +02:00
servers	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv	Revert "stdenv/setup.sh: unbreak *.lz sources on darwin"	2014-08-30 22:41:56 +02:00
test
tools	nox: updated sha to work after the recent fetchgit changes	2014-09-09 12:01:17 +02:00
top-level	Merge pull request #3934 from MP2E/chocolate-doom	2014-09-09 12:16:18 +02:00