Kp
|
75fc0d5e8a
|
Move */editor/ksegsize.c -> similar/editor/ksegsize.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
931b944cba
|
Move */editor/kgame.c -> similar/editor/kgame.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
1c7c90d038
|
Move */editor/eswitch.c -> similar/editor/eswitch.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
4ba0495b0a
|
Move */editor/eobject.c -> similar/editor/eobject.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
0d8cf57ab0
|
Move */editor/eglobal.c -> similar/editor/eglobal.c
|
2013-03-03 01:03:33 +00:00 |
|
|
Kp
|
043f12db26
|
Move */editor/curves.c -> similar/editor/curves.c
|
2013-03-03 01:03:33 +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
|
53c19f14f1
|
Move */editor/kmine.c -> similar/editor/kmine.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
7cb761f0a3
|
Move */editor/ksegmove.c -> similar/editor/ksegmove.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
4aeeab376b
|
Move */editor/ksegsel.c -> similar/editor/ksegsel.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
1692f38127
|
Move */editor/ktmap.c -> similar/editor/ktmap.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
baf0da84d2
|
Move */editor/kview.c -> similar/editor/kview.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
1030915f1c
|
Move */editor/medmisc.c -> similar/editor/medmisc.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
bff770f1d8
|
Move */editor/medsel.c -> similar/editor/medsel.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
5ca4d35bf5
|
Move */editor/texture.c -> similar/editor/texture.c
|
2013-03-17 23:01:33 +00:00 |
|
|
Kp
|
db5239deee
|
Move */main/console.c -> similar/main/console.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
9058a5c791
|
Move segment handling from editor.h
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
a842ddca86
|
Move */editor/autosave.c -> similar/editor/autosave.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
bd9702463e
|
Move */editor/elight.c -> similar/editor/elight.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
1aa9ae721e
|
Move */editor/fixseg.c -> similar/editor/fixseg.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
756ded6007
|
Move */editor/info.c -> similar/editor/info.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
a338f81663
|
Move */editor/kbuild.c -> similar/editor/kbuild.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
af3707d1c0
|
Move */editor/kcurve.c -> similar/editor/kcurve.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
6b5336a4b3
|
Move */editor/kfuncs.c -> similar/editor/kfuncs.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
ead39c4cc8
|
Move */editor/khelp.c -> similar/editor/khelp.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
e66b36de14
|
Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c
|
2013-03-17 23:01:32 +00:00 |
|
|
Kp
|
6ef38884e1
|
Move */arch/sdl/key.c -> similar/arch/sdl/key.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
ddb26fa198
|
Move */arch/sdl/event.c -> similar/arch/sdl/event.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
b5c3902697
|
Move */arch/sdl/init.c -> similar/arch/sdl/init.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
4bd3f0dbec
|
Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
b14f7c2f5f
|
Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
299b47656b
|
Move */misc/hash.c -> similar/misc/hash.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
68fec5f94a
|
Move */misc/physfsx.c -> similar/misc/physfsx.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
5c1f0f68cc
|
Move */mem/mem.c -> similar/mem/mem.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
78fde624f6
|
Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
ea29654c53
|
Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c
|
2013-03-17 23:01:31 +00:00 |
|
|
Kp
|
3fe3da9a25
|
Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c
|
2013-03-17 23:01:31 +00:00 |
|