Update version number in trunk to 2.15.1.

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 3df6413..14b7d70 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -3,6 +3,9 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.15.1
+  Update version number in trunk
+
 WinMerge 2.13.14 - 2010-09-15 (r7263)
   Update release compiler and runtimes to VS2008
   Remove ANSI binaries from distribution

diff --git a/versions.ini b/versions.ini
index a6b0719..e5eb1fc 100644 (file)
--- a/versions.ini
+++ b/versions.ini
@@ -7,13 +7,13 @@ type = InnoSetup
 description = WinMerge InnoSetup installer
 path = Installer/InnoSetup/WinMerge.iss
 macro = AppVersion
-version = "2.13.14"
+version = "2.15.1"
 
 [Executable]
 type = WinRC
 description = WinMerge executable
 path = Src/Merge.rc
-version = "2.13.14"
+version = "2.15.1"
 
 [Dll]
 type = WinRC