Hi Michael.
Trued my very best and hope it is now fixed.

Please try to merge again.


Am 26.11.2012 00:49, schrieb Michael Tremer:
Hey Alex,

those changes from here cannot be merged:

http://git.ipfire.org/?p=people/amarx/ipfire-2.x.git;a=commitdiff;h=0c4c147935be37bad8894ea51f6d502fa8a24fd9

You did much better on the commit message. That's good. But you also
reverted all changes that have been done by Stevee on the PMTU discovery
feature. You also reverted the changes from the language files that were
already upstream.

Please create an other patch which only includes *your* changes and send
it in, again.

Michael

On Fri, 2012-11-23 at 21:59 +0100, Alexander Marx wrote:
Dear List!

Changes are already in my Git repository, branch ccdfix.
Two bugs are fixed. Please test.

Alexander Marx


Fachinformatiker Systemintegration




_______________________________________________
Development mailing list
Development@lists.ipfire.org
http://lists.ipfire.org/mailman/listinfo/development

_______________________________________________
Development mailing list
Development@lists.ipfire.org
http://lists.ipfire.org/mailman/listinfo/development