From 18019a0dadaaabf63e8b4a44c9373c9e65b1097b Mon Sep 17 00:00:00 2001 From: zakk Date: Wed, 29 Nov 2006 23:31:20 +0000 Subject: I think this is appropriate for 994 :) git-svn-id: svn://svn.icculus.org/quake3/trunk@994 edf5b092-35ff-0310-97b2-ce42778d08ea --- NOTTODO | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NOTTODO b/NOTTODO index 8721780..df92441 100644 --- a/NOTTODO +++ b/NOTTODO @@ -19,3 +19,14 @@ Removing the SDL/OpenAL header files from SVN. Having them in SVN makes it easie for non-Linux platforms to compile the game. This isn't changing. MP3 support. It is already done, see: http://icculus.org/quake3/?page=patches + +All development should take place on the trunk. This includes bug +fixes, new features and experimental stuff. + +Release branches should not receive any commits that aren't also made +to the trunk. Normally you /shouldn't/ commit to release branches as +such commits are periodically merged from the trunk. These merges are +harder to perform if there are sporadic commits made in the interim. + +Under NO CIRCUMSTANCES ever commit to a tag. A tag is a static +snapshot which is intended to be unchanging. -- cgit v1.2.3