Kp
|
b87e7c2325
|
Merge branch 'd2x-rebirth/master' into unification/master
|
2013-06-02 20:14:42 +00:00 |
|
Kp
|
a842e15d94
|
Merge branch d2x-rebirth into unification/master
Conflicts:
SConstruct
common/include/editor/ehostage.h
common/main/cntrlcen.h
common/main/laser.h
common/main/mission.h
common/main/net_udp.h
common/main/object.h
main/vers_id.h
similar/editor/kfuncs.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/newmenu.c
similar/main/physics.c
|
2013-04-21 04:52:22 +00:00 |
|
Kp
|
4e3f3f3103
|
Move prototype of which_bomb to weapon.h
|
2013-03-17 23:01:31 +00:00 |
|
Kp
|
2b8d1fa5e7
|
Remove unused update_rendered_data parameter
This value is stored, but never read. Remove it.
|
2013-03-09 18:28:15 +00:00 |
|
Kp
|
7cda97cc74
|
Move d2x-rebirth source into subdirectory d2x-rebirth
|
2013-02-19 00:34:46 +00:00 |
|