Merge remote-tracking branch 'origin/master' into devel

# Conflicts: # docs/quickstart.md
vlvovch · Jan 25, 2019 · 6926a95 · 6926a95
2 parents 7684195 + 0ad3f7a
commit 6926a95
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -151,7 +151,7 @@ All changes can be saved to a file.
 
 ### Other notes
 
-- Sample C++ macros which use Thermal-FIST as a library can be found in the [$(ThermalFIST)/src/routines](../src/routines) folder
+- Sample C++ macros which use Thermal-FIST as a library can be found in the [$(ThermalFIST)/src/examples](../src/examples) folder
 
 - An example of using the Thermal-FIST library as a submodule is provided by [this repository](https://github.com/vlvovch/1807.02079)
 
@@ -173,4 +173,4 @@ All changes can be saved to a file.
 
 - Accuracy of the calculations in the canonical ensemble will eventually break down as the system volume is increased to a large value, such as that corresponding to central heavy-ion collisions. Accuracy of a canonical ensemble calculation can be verified by comparing the values of the exactly conserved charges computed in the model with the given ones.
 
-- The GUI program appears to hang when the cylindrically-symemetric event generator is invoked. This event generator has a fairly long initialization time (approx. 20-30 sec) after which the program proceeds smoothly.
+- The GUI program appears to hang when the cylindrically-symemetric event generator is invoked. This event generator has a fairly long initialization time (approx. 20-30 sec) after which the program proceeds smoothly.