Merge branch 'master' of https://github.com/C-CINA/2dx

LBEM-CH · Feb 27, 2014 · 00a2d6c · 00a2d6c
2 parents 81e9858 + da496ba
commit 00a2d6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,6 @@
 ############################################################################
 #
 
-
 find_program(HOSTNAME_CMD NAMES hostname)
 exec_program(${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
 

diff --git a/changes.htm.in b/changes.htm.in
@@ -3,7 +3,7 @@
 <body>
 
 
-<font color="blue">3.4.2</font> Feb. 6, 2014 <br>
+<font color="blue">3.4.2</font> Feb. 26, 2014 <br>
 <ul>
 <li>Full OSX-10.8 and OSX-10.9 support
 <li>Auto-saving added
@@ -17,16 +17,16 @@
 <li>Single Particle Processing scripts added, but not ready to use so far
 <li>Difference-map functions added
 <li>Command line merger 
-<li><font color="red">[bug] Beam-tilt refinement now working
-<li><font color="red">[bug] Maximal index in CCP4-script changed in order to achieve high resolution (better than 6A)
+<li><font color="red">[bug]</font> Beam-tilt refinement now working
+<li><font color="red">[bug]</font> Maximal index in CCP4-script changed in order to achieve high resolution (better than 6A)
 <li>Latest version of CTFFIND3 integrated (incl. OMP)
 <li>Refine switch now also refines the tilt-geometry
-<li><font color="red">[bug] Resolution plot fixed
-<li><font color="red">[bug] Error on PLTILTK fixed
-<li><font color="red">[bug] Big in astigmatic handling of CTF fixed
-<li><font color="red">File initialization improved
-<li><font color="red">[bug] Synchronization for .raw.mrc files fixed
-<li><font color="red">[bug] Reference origin resetting works now
+<li><font color="red">[bug]</font> Resolution plot fixed
+<li><font color="red">[bug]</font> Error on PLTILTK fixed
+<li><font color="red">[bug]</font> Bug in astigmatic handling of CTF fixed
+<li>File initialization improved
+<li><font color="red">[bug]</font> Synchronization for .raw.mrc files fixed
+<li><font color="red">[bug]</font> Reference origin resetting works now
 <li>Parameters are reset for a new image now
 <li>Optimal image import for K2 Summit data
 <li>Selection of multiple images with right-click now possible
@@ -35,7 +35,7 @@
 <li>Added options for tilt-angle range statistics
 <li>Included fomstat in 2dx_merge_merge again
 <li>Masking both lattices at the same time now possible
-<li><font color="red">[bug] Issue with symmetry p4 in hklsym fixed
+<li><font color="red">[bug]</font> Issue with symmetry p4 in hklsym fixed
 <li>PDF translator added
 <li>Better sync with backup script
 <li>NANs removed from hklsym4-output
@@ -49,13 +49,13 @@
 <li>Support for TVIPS-headers
 <li>Origtilt output extended
 <li>2dx_hklsym3 removed
-<li><font color="red">[bug] Contour plot in p2 now working
+<li><font color="red">[bug]</font> Contour plot in p2 now working
 <li>Amplitude scaling added
 <li>Quality evaluation added (2D and 3D)
 <li>Longer image names now supported
 <li>MergeIQMAX added
-<li><font color="red">[bug] Unsigned/singed integer issue finally fixed
-<li><font color="red">[bug]TLTPLOT now used correctly
+<li><font color="red">[bug]</font> Unsigned/singed integer issue finally fixed
+<li><font color="red">[bug]</font> TLTPLOT now used correctly
 <li>Second lattice determination
 <li>Shortcuts to image/merge directory added in 2dx_image/2dx_merge
 <li>Shortcut to logbrowser added
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     ############################################################################
     #
     find_program(HOSTNAME_CMD NAMES hostname)
     exec_program(${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
@@ Expand Down @@