Re: [PATCH v3 1/5] dnsproxy: Move from plugins to core

2011-01-25 Thread Marcel Holtmann
Hi Daniel,

  Makefile.am|4 +-
  Makefile.plugins   |   12 -
  README |   17 +-
  configure.ac   |7 -
  plugins/dnsproxy.c | 1517 
 
  src/connman.h  |4 +
  src/dnsproxy.c | 1512 +++
  src/main.c |2 +
  8 files changed, 1521 insertions(+), 1554 deletions(-)
  delete mode 100644 plugins/dnsproxy.c
  create mode 100644 src/dnsproxy.c

Applying: dnsproxy: Move from plugins to core
/data/devel/connman/.git/rebase-apply/patch:1646: new blank line at EOF.
+
fatal: 1 line adds whitespace errors.
Patch failed at 0001 dnsproxy: Move from plugins to core

Regards

Marcel


___
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman


Re: [PATCH v3 1/5] dnsproxy: Move from plugins to core

2011-01-25 Thread Daniel Wagner
Hi Marcel,

On Tue, Jan 25, 2011 at 06:48:46PM +0100, Marcel Holtmann wrote:
 Applying: dnsproxy: Move from plugins to core
 /data/devel/connman/.git/rebase-apply/patch:1646: new blank line at EOF.
 +
 fatal: 1 line adds whitespace errors.
 Patch failed at 0001 dnsproxy: Move from plugins to core

Sorry about that. I'll fix that asap.

thanks,
daniel

___
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman