Merge branch 'portals2_visual' of github.com:jewalky/zdoom into portals2_visual

Browse Source

Conflicts:
	src/p_setup.cpp
	src/p_udmf.cpp

...

This commit is contained in:

ZZYZX 2015-06-07 04:21:08 +03:00

parent b3764f4ee2 45c97c3ac5

commit a520d35d89

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available