Commit 31dc3e8c authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'release22' into 'v2.2-stable' 

Prepare Release v2.2

See merge request allpix-squared/allpix-squared!687
parents 4c69afa3 79da1f0a

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ IF(COMMAND CMAKE_POLICY) 
ENDIF(COMMAND CMAKE_POLICY)



# Set default version

SET(ALLPIX_VERSION "v2.1.2")

SET(ALLPIX_VERSION "v2.2.0")



# Set default build type

IF(NOT CMAKE_BUILD_TYPE)

README.md

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ The following authors, in alphabetical order, have developed or contributed to A 
* Sebastian Schmidt, FAU Erlangen, @schmidtseb

* Sanchit Sharma, Kansas State University, @SanchitKratos

* Xin Shi, Institute of High Energy Physics Beijing, @xshi

* Petr Smolyanskiy, Czech Technical Univbersity Prague, @psmolyan

* Viktor Sonesten, GSOC2018 Student, @tmplt

* Reem Taibah, Université de Paris, @retaibah

* Ondrej Theiner, Charles University, @otheiner