Commit 0d4e23d6 authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

it's the little fixes that do us in

Original commit message from CVS:
it's the little fixes that do us in
parent 4c055db5
......@@ -5,9 +5,9 @@ SOME OF THE FIRST IDEAS, PRETTY OUTDATED
During the course of a discussion on IRC, it turned out
that there are many possible ways to handle the capabilities.
A capabilitiy is bascially a set of properties attached to a
A capability is basically a set of properties attached to a
mimetype in order to more closely describe the mimetype.
Capabiltities are supposed to be attached to pads so that the
Capabilities are supposed to be attached to pads so that the
autoplugging algorithm has more specific information to connect
compatible pads.
......
......@@ -121,8 +121,10 @@ TODO :
- Later on, if necessary, merge back latest release branch to current dev
branch (if patches to source were made)
* change to a HEAD branch, make sure it's updated
* cvs diff -r RELEASE-0_3_4-30SECONDFRENCHMAN -R
gives a list of differences between head and release tag
* cvs diff -R -r RELEASE-0_3_4-30SECONDFRENCHMAN
gives a list of differences between head and release tag,
stuff with > is how it's in HEAD, < is in the rel branch
* cvs update -j BRANCH-RELEASE-0_3_4
merges the difference made in that branch to the current source
this is what you want to use when merging back the branch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment