loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix branch documentation

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128707067
This commit is contained in:
olly 2016-07-28 09:28:21 -07:00 committed by Oliver Woodman
parent 2040615cc8
commit 5eb6190682
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTING.md
View File

@ -17,8 +17,9 @@ gives some examples of what to include.
## Pull requests ## ## Pull requests ##
We will also consider high quality pull requests. These should normally merge We will also consider high quality pull requests. These should normally merge
into the [dev][] branch rather than master. To contribute in this way you must into the `dev-vX` branch with the highest major version number. Bug fixes may
first submit a Contributor License Agreement, as described below. be suitable for merging into older `dev-vX` branches. Before a pull request can
be accepted you must submit a Contributor License Agreement, as described below.
[dev]: https://github.com/google/ExoPlayer/tree/dev [dev]: https://github.com/google/ExoPlayer/tree/dev

15
README.md
View File

@ -64,12 +64,15 @@ and copy `library.jar` to the libs folder of your new project.
#### Project branches #### #### Project branches ####
* The [`master`][master] branch holds the most recent minor release. * The project has `dev-vX` and `release-vX` branches, where `X` is the major
* Most development work happens on the [`dev`][dev] branch. version number.
* Additional development branches may be established for major features. * Most development work happens on the `dev-vX` branch with the highest major
version number. Pull requests should normally be made to this branch.
[master]: https://github.com/google/ExoPlayer/tree/master * Bug fixes may be submitted to older `dev-vX` branches. When doing this, the
[dev]: https://github.com/google/ExoPlayer/tree/dev same (or an equivalent) fix should also be submitted to all subsequent
`dev-vX` branches.
* A `release-vX` branch holds the most recent stable release for major version
`X`.
#### Using Android Studio #### #### Using Android Studio ####