aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-20 22:45:24 +0300
committerEli Zaretskii2010-08-20 22:45:24 +0300
commit491a154635caf0bf90fd1c4ad35f02d43eac98ee (patch)
treed47c679faf5c85ffb51db044abea4992a9962bed /src
parent8ee818927b65c6efa665e5ba13d25f985721de04 (diff)
downloademacs-491a154635caf0bf90fd1c4ad35f02d43eac98ee.tar.gz
emacs-491a154635caf0bf90fd1c4ad35f02d43eac98ee.zip
Fix version string in top-level MSDOS Makefile.
msods/mainmake.v2 (version): Update due to change in emacs.c. src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's dependency on the syntax of this declaration.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/emacs.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 024cf18efb6..24754355fdc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-08-15 Eli Zaretskii <eliz@gnu.org>
2
3 * emacs.c <emacs_version>: Add a comment regarding
4 msdos/mainmake.v2's dependency on the syntax of this declaration.
5
12010-08-13 Eli Zaretskii <eliz@gnu.org> 62010-08-13 Eli Zaretskii <eliz@gnu.org>
2 7
3 * unexcoff.c: Remove the parts used when "emacs" is not defined. 8 * unexcoff.c: Remove the parts used when "emacs" is not defined.
diff --git a/src/emacs.c b/src/emacs.c
index 026a210af50..67a99d674e7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -91,6 +91,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
91#endif 91#endif
92#endif 92#endif
93 93
94/* If you change the following line, remember to update
95 msdos/mainmake.v2 which gleans the Emacs version from it! */
94static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; 96static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
95static const char emacs_version[] = "24.0.50"; 97static const char emacs_version[] = "24.0.50";
96 98