[git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-120-geec0b39

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, npth has been updated
       via  eec0b39a477b3d0da243b53492123d1e82340167 (commit)
       via  7dfcc9f19acfe8f0dc70db8d981b79aac0589cf4 (commit)
       via  d4fa82e688c1844777896f02cb3c8dea8a5d4f9a (commit)
      from  0e5d57cc6d839b90d642308085e4800a67f89250 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eec0b39a477b3d0da243b53492123d1e82340167
Merge: 0e5d57c 7dfcc9f
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Tue Oct 25 17:37:53 2011 +0200

    Merge branch 'master' into npth
    
    Conflicts:
    	common/ChangeLog

diff --cc common/ChangeLog
index d1090e0,54435f4..840dc03
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
+ 2011-10-24  Werner Koch  <wk at g10code.com>
+ 
+ 	* dotlock.h, dotlock.c: Add alternative to allow distribution of
+ 	these files under a modified BSD license
+ 
 +2011-10-13  Marcus Brinkmann  <marcus at g10code.com>
 +
 +	* estream.c, exechelp-posix.c, exechelp-w32.c, exechelp-w32ce.c,
 +	http.c, init.c, sysutils.c: Port to NPth.
 +
  2011-09-30  Werner Koch  <wk at g10code.com>
  
  	Change the license of all JNLIB parts from LPGLv3+ to to LGPLv3+

-----------------------------------------------------------------------

Summary of changes:
 common/ChangeLog |    5 +++++
 common/dotlock.c |   36 ++++++++++++++++++++++++++++++++++++
 common/dotlock.h |   36 ++++++++++++++++++++++++++++++++++++
 doc/gpgsm.texi   |   31 ++++++++++++++++---------------
 4 files changed, 93 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org