diff options
author | Jacob Appelbaum <jacob@appelbaum.net> | 2013-03-20 15:38:56 -0400 |
---|---|---|
committer | Jacob Appelbaum <jacob@appelbaum.net> | 2013-03-20 15:38:56 -0400 |
commit | 049da9b7488eba77111d4820c3a6579491652c31 (patch) | |
tree | 131f915a86906d6db155d908b76e4e0386cb0a8c /CHANGELOG | |
parent | 19b812b4e284be15eea7d150d6fe761c504457ef (diff) | |
download | tlsdate-049da9b7488eba77111d4820c3a6579491652c31.tar.gz |
Merge conflict issues
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -4,8 +4,6 @@ Fix a race in tlsdate-dbus-announce that can cause signal drops. Support -l argument to tlsdated. Pass -l and -v arguments from tlsdated to tlsdate. - Log more verbosely at tlsdated startup. - Add FreeBSD support for tlsdate and tlsdate-helper. 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate. |