Commit graph

7 commits

Author SHA1 Message Date
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp a1ba420031 Mark various parameters and variables as const 2013-07-20 23:12:24 +00:00
Kp 9b50efca0e Make local_to_remote and remote_to_local static 2013-07-20 17:09:53 +00:00
Kp 5648874a37 Merge branch d2x-rebirth/master into unification/master 2013-06-14 03:31:59 +00:00
Kp b87e7c2325 Merge branch 'd2x-rebirth/master' into unification/master 2013-06-02 20:14:42 +00:00
Kp a4277df58f Merge branch 'unify-d2x-rebirth' into unify
Conflicts:
	SConstruct
	common/include/editor/editor.h
	d2x-rebirth/editor/ehostage.c
	d2x-rebirth/include/d_glob.h
	d2x-rebirth/include/d_io.h
	d2x-rebirth/main/desc_id.h
	d2x-rebirth/main/gamestat.h
	d2x-rebirth/main/link.bat
2013-03-31 17:24:44 +00:00
Kp 7cda97cc74 Move d2x-rebirth source into subdirectory d2x-rebirth 2013-02-19 00:34:46 +00:00
Renamed from main/multi.c (Browse further)