From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: ccdfix-21-11-2012
Date: Fri, 23 Nov 2012 12:44:14 +0100 [thread overview]
Message-ID: <1353671054.14956.23.camel@rice-oxley.tremer.info> (raw)
In-Reply-To: <50ACA295.9050909@oab.de>
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
I cannot merge your branch because of conflicts.
So here are some things that need to be fixed:
Rebase the branch to origin/next and please edit the commit messages,
which are just not helpful. Read this for a short introduction about
good commit messages:
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
Translation strings must be:
You are not able to save any changes while the OpenVPN server is running.
and
Änderungen können nicht gespeichert werden, solange der OpenVPN-Server läuft.
Michael
On Wed, 2012-11-21 at 10:44 +0100, Alexander Marx wrote:
> Dear List!
>
> i fixed all Bugs which are known by now.
>
> Changes are already in my Git repository, branch ccdfix.
>
> Attached the package files which are tested on core 64.
>
> Except the mtu-disc- bug all things are tested with Windows 7 and
> linux mint12 client.
> I found no more bugs. Please test it.
>
> --
>
>
> Alexander Marx
>
>
> Fachinformatiker Systemintegration
>
>
>
>
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development
next parent reply other threads:[~2012-11-23 11:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <50ACA295.9050909@oab.de>
2012-11-23 11:44 ` Michael Tremer [this message]
2012-11-23 13:10 ` ccdfix-21-11-2012 Erik K.
2012-11-25 8:15 ` ccdfix-21-11-2012 Alexander Marx
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353671054.14956.23.camel@rice-oxley.tremer.info \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox