Merge branch 'master' into 1.5.0
Conflicts: ChangeLog NEWS configure.ac html/task.html src/task.cpp src/task.h
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
<a href="date.html">Date Handling</a>
|
||||
<a href="troubleshooting.html">Troubleshooting</a>
|
||||
<a href="versions.html">Old Versions</a>
|
||||
<a href="links.html">Task on the Web</a>
|
||||
</div>
|
||||
|
||||
<div id="content">
|
||||
|
||||
Reference in New Issue
Block a user