Merge branch 't/crypt_cleanups'
authorAndre Noll <maan@systemlinux.org>
Sat, 23 Apr 2011 13:54:59 +0000 (15:54 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 23 Apr 2011 13:58:22 +0000 (15:58 +0200)
Conflicts:
Makefile.in

15 files changed:
1  2 
Makefile.in
NEWS
afh.c
audioc.c
audiod.c
client_common.c
command.c
configure.ac
error.h
fade.c
grab_client.c
gui.c
recv.c
server.c
write.c

diff --cc Makefile.in
@@@ -56,7 -54,7 +56,6 @@@ CPPFLAGS += -Wunused-macro
  CPPFLAGS += -Wbad-function-cast
  CPPFLAGS += -fno-strict-aliasing
  CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
- CPPFLAGS += @SSL_CPPFLAGS@
 -CPPFLAGS += @ncurses_cppflags@
  CPPFLAGS += @arch_cppflags@
  CPPFLAGS += -I/usr/local/include
  CPPFLAGS += -I$(cmdline_dir)
diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,15 -1,6 +1,16 @@@
 ------------------------------------------------
 -0.4.6 (to be announced) "deterministic entropy"
 ------------------------------------------------
 +-------------------------------------------
 +0.4.7 (to be announced) "infinite rollback"
 +-------------------------------------------
 +
 +      - configure: improved options for ogg/vorbis/speex.
 +      - The git version reported by --version always matches HEAD.
 +      - The autogen script detects the number of processors and
 +        runs a parallel make if possible.
++      - Major cleanup of the crypto API.
 +
 +------------------------------------------
 +0.4.6 (2011-03-31) "deterministic entropy"
 +------------------------------------------
  
  Lots of ogg/vorbis improvements, the new test suite, enhancements
  for para_gui and a fair amount of other bug fixes.
diff --cc afh.c
Simple merge
diff --cc audioc.c
Simple merge
diff --cc audiod.c
Simple merge
diff --cc client_common.c
@@@ -23,9 -20,7 +20,8 @@@
  #include "string.h"
  #include "client.cmdline.h"
  #include "client.h"
- #include "hash.h"
  #include "buffer_tree.h"
 +#include "version.h"
  
  /** The size of the receiving buffer. */
  #define CLIENT_BUFSIZE 4000
diff --cc command.c
Simple merge
diff --cc configure.ac
Simple merge
diff --cc error.h
Simple merge
diff --cc fade.c
Simple merge
diff --cc grab_client.c
Simple merge
diff --cc gui.c
Simple merge
diff --cc recv.c
Simple merge
diff --cc server.c
Simple merge
diff --cc write.c
Simple merge