Merge 'progress' branch.
authorparasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Wed, 12 Mar 2008 14:52:26 +0000 (14:52 +0000)
committerparasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Wed, 12 Mar 2008 14:52:26 +0000 (14:52 +0000)
commitf915848a60b58518a26571723405a5c22d67e668
tree5b01f5828ba51d12291fab8e055e9839c74938e3
parentf5aaa0111f0b53f6f3f8680c86ca2acf47b3ba5c
Merge 'progress' branch.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1877 78b8d119-cf0a-0410-b17c-f493084dd1d7
38 files changed:
Makefile
ball/demo.c
ball/demo.h
ball/game.c
ball/game.h
ball/hud.c
ball/level.c
ball/level.h
ball/levels.c [deleted file]
ball/levels.h [deleted file]
ball/main.c
ball/mode.c [deleted file]
ball/mode.h [deleted file]
ball/progress.c [new file with mode: 0644]
ball/progress.h [new file with mode: 0644]
ball/set.c
ball/set.h
ball/st_demo.c
ball/st_done.c
ball/st_fall_out.c
ball/st_goal.c
ball/st_help.c
ball/st_level.c
ball/st_over.c
ball/st_pause.c
ball/st_play.c
ball/st_save.c
ball/st_set.c
ball/st_start.c
ball/st_time_out.c
ball/st_title.c
ball/util.c
ball/util.h
data/gui/demo1.nbr
data/gui/demo2.nbr
share/config.c
share/config.h
share/lang.h