From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <4CA9CB9A.5090200@domain.hid> Date: Mon, 04 Oct 2010 14:42:02 +0200 From: Gilles Chanteperdrix MIME-Version: 1.0 References: <4CA9BF97.2060609@domain.hid> In-Reply-To: <4CA9BF97.2060609@domain.hid> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Xenomai-core] [git pull] Refreshed & host-clock-enhanced queue for head List-Id: Xenomai life and development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Xenomai core , Wolfgang Mauerer Jan Kiszka wrote: > The following changes since commit 0f0db62bc5ed90aaf85c87af876fbc319131a640: > > Merge remote branch 'v2.5.x' (2010-10-04 10:27:03 +0200) Ok. Could you rebase instead of merge so that our branches do not start diverging ? -- Gilles.