summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrainwater <rainwater@43f3a57c-415d-409d-a226-9ac53bca7782>2017-05-08 14:15:53 +0000
committerrainwater <rainwater@43f3a57c-415d-409d-a226-9ac53bca7782>2017-05-08 14:15:53 +0000
commit745f0e7638835eb95a3c41b611919b94410f42d1 (patch)
treeaa3b777032a3870e9a73952f3e43043b49ddaebd
parenta35e53b7a01527026ee2d48c9af7abc1565513f8 (diff)
Bump version
git-svn-id: svn://svn.code.sf.net/p/miranda/svn/trunk@14658 43f3a57c-415d-409d-a226-9ac53bca7782
-rw-r--r--miranda/bin/makepak.bat2
-rw-r--r--miranda/docs/changelog.txt5
-rw-r--r--miranda/include/m_version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/miranda/bin/makepak.bat b/miranda/bin/makepak.bat
index 8a293e37e..ff32a77ab 100644
--- a/miranda/bin/makepak.bat
+++ b/miranda/bin/makepak.bat
@@ -1,4 +1,4 @@
-set Version=0.10.68
+set Version=0.10.69
set PDBVer=miranda-im-v%Version%-ansi-pdb
set FileVer=miranda-im-v%Version%-ansi
diff --git a/miranda/docs/changelog.txt b/miranda/docs/changelog.txt
index 53363e6aa..b2579c94e 100644
--- a/miranda/docs/changelog.txt
+++ b/miranda/docs/changelog.txt
@@ -3,6 +3,11 @@
www.miranda-im.org
+* New in 0.10.69
+Bugfixes:
+ - Fix hang on exit
+
+
* New in 0.10.68
Enhancements:
- Improved database optimization on exit
diff --git a/miranda/include/m_version.h b/miranda/include/m_version.h
index d80e032f7..dd6888538 100644
--- a/miranda/include/m_version.h
+++ b/miranda/include/m_version.h
@@ -27,9 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MIRANDA_MAKE_VERSION(a,b,c,d) (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
#endif
-#define MIRANDA_VERSION_FILEVERSION 0,10,68,0
-#define MIRANDA_VERSION_STRING "0.10.68.0"
-#define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(0, 10, 68, 0)
-#define MIRANDA_VERSION_CORE_STRING "0.10.68"
+#define MIRANDA_VERSION_FILEVERSION 0,10,69,0
+#define MIRANDA_VERSION_STRING "0.10.69.0"
+#define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(0, 10, 69, 0)
+#define MIRANDA_VERSION_CORE_STRING "0.10.69"
#endif // M_VERSION_H__