[mary-dev] main development branch

[Marc Schroeder]

Hi Timo,

yes, please treat 4.x-branch as the stable bugfix branch. So if your 
patches concern fixes, as opposed to new features, that is where they 
should go. If it is fundamentally new or improved functionality, it 
should go in the trunk.

Cheers,
Marc

On 10.10.11 10:27, Timo Baumann wrote:
> Hi,
>
> I would like to submit some patches and I'm wondering what branch I
> should create them against. In
> http://www.dfki.de/mailman/pipermail/mary-dev/2011-July/000229.html Marc
> proposes to use /branches/4.x-branch for development which works for me
> out-of-the-box in Eclipse and would hence be much less hassle than using
> /trunk. Is that comment from July still valid?
>
> Cheers,
> Timo
> _______________________________________________
> Mary-dev mailing list
> Mary-dev at dfki.de
> http://www.dfki.de/mailman/cgi-bin/listinfo/mary-dev

-- 
Dr. Marc Schröder, Senior Researcher at DFKI GmbH
Project leader for DFKI in SSPNet http://sspnet.eu
Team Leader DFKI TTS Group http://mary.dfki.de
Editor W3C EmotionML Working Draft http://www.w3.org/TR/emotionml/
Portal Editor http://emotion-research.net

Homepage: http://www.dfki.de/~schroed
Email: marc.schroeder at dfki.de
Phone: +49-681-85775-5303
Postal address: DFKI GmbH, Campus D3_2, Stuhlsatzenhausweg 3, D-66123 
Saarbrücken, Germany
--
Official DFKI coordinates:
Deutsches Forschungszentrum fuer Kuenstliche Intelligenz GmbH
Trippstadter Strasse 122, D-67663 Kaiserslautern, Germany
Geschaeftsfuehrung:
Prof. Dr. Dr. h.c. mult. Wolfgang Wahlster (Vorsitzender)
Dr. Walter Olthoff
Vorsitzender des Aufsichtsrats: Prof. Dr. h.c. Hans A. Aukes
Amtsgericht Kaiserslautern, HRB 2313