-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Nils Kneuper schrieb:
| Nils Kneuper schrieb:
| | * deadline for 1.4.0 commits: Sunday, 2nd March, 1pm (gmt+1)
|
| Turns run out!
|
| | * trunk frozen + start of release stuff: Sunday, 2nd March, 2pm (gmt+1)
|
| Turns run out!
|
| | * trunk free for 1.4+1.5 commits (not branched off yet): Sunday, 2nd March, 
8pm
| | (gmt+1)
|
| Currently active. For the next 4 to 6 hours you are free to commit stuff that 
is
| meant to end in both, 1.4.x and in trunk. Do not commit any trunk-only stuff.
| That has to wait 6 more hours until 1.4 is in its own branch.

Turns run out!

| | * branching off 1.4 to branches/1.4, trunk free for 1.5.0-svn commits: 
Sunday,
| | 2nd March, 11pm
|
| In about 6h 1.4 will be branched off to branches/1.4. Then trunk/ is free for
| new stuff. Though it would be good if you coordinated with Dave, so that he 
can
| first merge his formula ai changes into trunk/src.

Done.

Now there is branches/1.4 for all the 1.4 stuff and trunk for all the things
adding features and stuff. For the moment Dave asked to not commit stuff to
trunk/src until he has a chance to merge in formula ai. Beside this you can
start the "real work" on trunk again. It will be at least 6 weeks until the next
dev release named 1.5.0.

Regarding stuff that should go to branches/1.4:
* translation updates
* non-intrusive bugfixes
* graphics update (if wanted/needed)
That's basically everything. All the real polishing like "let's rewrite scenario
XYZ" and "man, this feature would be great" should go to trunk instead.

When we need a new stable release, there has to be at least one week of
stringfreeze before this. Just as a warning for everybody of you. I don't think
there will be something like 1.4.1 withhin the next three weeks, but just to
make sure...

Cheers,
Nils Kneuper aka Ivanovic

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHyzCLfFda9thizwURAmBoAJ9z0+DRTaebiRowxMKDyBhjalvE1QCcDCAn
5rPB39W7cKoGrjuDQ6Gf1/A=
=M7gI
-----END PGP SIGNATURE-----

_______________________________________________
Wesnoth-dev mailing list
Wesnoth-dev@gna.org
https://mail.gna.org/listinfo/wesnoth-dev

Reply via email to