# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1450254220 -3600
# Node ID b1a6b90a16679240ae4dd54d77cf33f17016ee77
# Parent  d7f63122c7f3a52f3c63ffacda772d4d9a3f3cae# Parent  74cf1f350b45473e847fed4116c1b428fa3d7352
back to mainline

diff -r d7f63122c7f3 -r b1a6b90a1667 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 15 17:22:52 2015 +0100
+++ b/CMakeLists.txt	Wed Dec 16 09:23:40 2015 +0100
@@ -3,7 +3,7 @@
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.0.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff -r d7f63122c7f3 -r b1a6b90a1667 NEWS
--- a/NEWS	Tue Dec 15 17:22:52 2015 +0100
+++ b/NEWS	Wed Dec 16 09:23:40 2015 +0100
@@ -1,9 +1,13 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.0.0 (2015/12/15)
+==========================
+
 * Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests
+* New function in plugin SDK: "OrthancPluginSendMultipartItem2()"
 * Fix of DICOMDIR generation with DCMTK 3.6.1, support of encodings
-* New function in plugin SDK: "OrthancPluginSendMultipartItem2()"
 * Fix range search if the lower or upper limit is absent
 * Fix modality worklists lookups if tags with UN (unknown) VR are present
 * Warn about badly formatted modality/peer definitions in configuration file at startup