diff options
| author | twinaphex | 2013-01-10 03:06:17 +0100 |
|---|---|---|
| committer | twinaphex | 2013-01-10 03:06:17 +0100 |
| commit | e5f4d90401d099d5191f95e9f771ab5a81c87ed8 (patch) | |
| tree | 8de3efcfd7bf5111ea62a43ecd7db558f2ec8350 /frontend/main.h | |
| parent | ac7b2a33ddb2392582c50d29c772e9e99cd762c9 (diff) | |
| parent | d77e74383a9134e51c31607cfddf4dcd3535a0ae (diff) | |
| download | pcsx_rearmed-e5f4d90401d099d5191f95e9f771ab5a81c87ed8.tar.gz pcsx_rearmed-e5f4d90401d099d5191f95e9f771ab5a81c87ed8.tar.bz2 pcsx_rearmed-e5f4d90401d099d5191f95e9f771ab5a81c87ed8.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'frontend/main.h')
| -rw-r--r-- | frontend/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/main.h b/frontend/main.h index 45e0aeb..d971890 100644 --- a/frontend/main.h +++ b/frontend/main.h @@ -52,7 +52,7 @@ int emu_load_state(int slot); void set_cd_image(const char *fname); extern unsigned long gpuDisp; -extern int ready_to_go; +extern int ready_to_go, g_resetting; extern char hud_msg[64]; extern int hud_new_msg; |