diff --git a/CHANGELOG b/CHANGELOG
index 3dab58886a7188aa7990555450726053bf7d6a03..9092f5841f75c13e3fd6a70d4ddec9adf7ee31b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,45 @@
+BornAgain-1.2.0, released 2015.06.10
+ > API Changes:
+ 1) Rename: 'Simulation' --> 'GISASSimulation' for consistency with other types of simulations
+ 2) Removed 'ParticleInfo' completely from public API: position information is now encoded in the Particle's themselves
+ > Summary:
+ 1) Documentation: scalar scattering theory in manual
+ 2) Support for polarized neutron scattering with polarization/analysis along different axes (not restricted to z-axis)
+ 3) New features in Graphical User Interface
+ a) GUI real time view is now saved in projects
+ b) Beam divergence can be exported to Python script
+ 4) Various bug fixes
+ > Details of Sprint #27 (see http://apps.jcns.fz-juelich.de/redmine/projects/bornagain/issues)
+ * Bug #1047: Release script: move MAC dmg package into 'old' directory
+ * Bug #1048: Update release script for new user manual
+ * Bug #1050: GUI: Variation of lattice orientation in real time view does not work for example 'Hexagonal lattice with basis'
+ * Bug #1057: GUI: run job that was 'Submit only' does not produce a plot
+ * Bug #1066: Model lost after unsuccessful load
+ * Bug #1067: Keyboard shortcuts not always working
+ * Bug #1069: Crash when entering parameter out of range in sample view
+ * Bug #1077: Fix min, max handling for z-axis of ColorMap plot
+ * Bug #1079: Fix appearance of tab with job details on JobView
+ * Bug #1085: Fix crash of GUI while trying to save the project under the name containing special characters
+ * Bug #1091: BORNAGAIN_APP flag does not automatically build 'App'
+ * Bug #1093: showstoppers for release of manual v1.x
+ * Bug #1097: update reference data for functional test 65: montecarlo_integration.py
+ * Feature #957: Investigate automatic generation of meaningful docstring for PythonAPI
+ * Feature #959: GUI: implement saving of RealTimeView content in JobModel
+ * Feature #979: Add standard GNU options -v --version to command bornagain
+ * Feature #996: GUI: implement export to Python in the case of beam divergence
+ * Feature #1015: Implement polarized neutron scattering with beam density matrix and analyser spin filter
+ * Feature #1040: Change angle units from radians to degrees while exporting from PyGenVisitor
+ * Feature #1051: Implement warning sign widget in real time view
+ * Feature #1056: Make default build to not to use system's ROOT
+ * Feature #1062: Add item in drupal's troubleshooting section explaining possible interference between BornAgain and Mantid on MacOS
+ * Feature #1063: Add item in drupal troubleshooting section explaining conflict with previous BornAgain installation
+ * Documentation #915: Provide poster for Galaxi control room
+ * Documentation #990: Proof-read chapter on scalar scattering theory
+ * Documentation #1058: Describe how to install BornAgain on mac to user home folder
+ * Documentation #1059: Provide poster for our building
+ * Refactoring #1046: Replace unnecessary shared_ptr's with scoped_ptr's
+ * Refactoring #1074: Replace complex OutputData structures at low level with vector of required input/output
+
BornAgain-1.1.0, released 2015.04.15
> Summary:
1) New form factor of truncated cube
diff --git a/Core/Samples/inc/BAVersion.h b/Core/Samples/inc/BAVersion.h
index fc659a6a8293c3b35b3ed1e76383f6a9b6e71a52..2b009226adc2d9da36864a656eac7100ce8fc76d 100644
--- a/Core/Samples/inc/BAVersion.h
+++ b/Core/Samples/inc/BAVersion.h
@@ -22,7 +22,7 @@
namespace BornAgain {
const int major_version_number = 1;
- const int minor_version_number = 1;
+ const int minor_version_number = 2;
const int patch_version_number = 0;
inline int GetMajorVersionNumber() { return major_version_number; }
diff --git a/Doc/Doxygen/Doxyfile b/Doc/Doxygen/Doxyfile
index c55a0ebac45b0f946c750d29bf438a92a051ded2..b2cb03553acb883a6c5a393ad92488460c358bd9 100644
--- a/Doc/Doxygen/Doxyfile
+++ b/Doc/Doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "BornAgain"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.1.0
+PROJECT_NUMBER = 1.2.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -1769,7 +1769,7 @@ MAN_LINKS = NO
# captures the structure of the code including all documentation.
# The default value is: NO.
-GENERATE_XML = YES
+GENERATE_XML = NO
# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
diff --git a/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake b/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
index adaa5d7c218a9292e479a17184740bc3ab13fbfb..03af66614c290b2dad63f50fa5b20f78d016a296 100644
--- a/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
+++ b/Examples/cpp/CylindersAndPrisms/modules/FindBornAgain.cmake
@@ -6,8 +6,8 @@
set(BORNAGAINSYS $ENV{BORNAGAINSYS})
if(BORNAGAINSYS)
- set(BORNAGAIN_LIBRARY_DIR ${BORNAGAINSYS}/lib/BornAgain-1.1)
- set(BORNAGAIN_INCLUDE_DIR ${BORNAGAINSYS}/include/BornAgain-1.1)
+ set(BORNAGAIN_LIBRARY_DIR ${BORNAGAINSYS}/lib/BornAgain-1.2)
+ set(BORNAGAIN_INCLUDE_DIR ${BORNAGAINSYS}/include/BornAgain-1.2)
endif()
find_library (BORNAGAIN_CORE BornAgainCore
diff --git a/VERSION.cmake b/VERSION.cmake
index 46811c3bb94304e6d9aae805d45f1d02a2c87277..132ad3266770840fa426918fcc058f2dfb621fe4 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
set(BornAgain_VERSION_MAJOR 1)
-set(BornAgain_VERSION_MINOR 1)
+set(BornAgain_VERSION_MINOR 2)
set(BornAgain_VERSION_PATCH 0)