Commit 20936a46 authored by thrust26's avatar thrust26
Browse files

Merge branch 'master' of https://github.com/stella-emu/stella

parents db833249 63d7a3f9
......@@ -18,7 +18,7 @@
#ifndef VERSION_HXX
#define VERSION_HXX
#define STELLA_VERSION "6.1_pre"
#define STELLA_BUILD "4705"
#define STELLA_VERSION "6.1_beta1"
#define STELLA_BUILD "4877"
#endif
......@@ -414,4 +414,4 @@ int StellaSettingsDialog::valueToLevel(int value)
return i;
}
return 0;
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment