diff --git a/docs/branches.html b/docs/branches.html new file mode 100644 index 000000000..85fb07b36 --- /dev/null +++ b/docs/branches.html @@ -0,0 +1,48 @@ + + + Branches + + + +

Branches logic in this repo is not too simple. So I write this text to explain +which branches we use for builds and how we merge the branches.

+ +

Branches semantic

+ +

Main branches

+ + + + + + + +
masterthis branch is used for android 2.* builds
ice-cream-sandwichthis branch contains all code for android 3/4/5 releases except yotaphone 1 code that requires a non-free (?) yota SDK
yota2ice-cream-sandwich + yotaphone 1 code; used for official android 3/4/5 builds
nookthis branch is used for Nook Simple Touch version builds
kindlethis branch is used for builds fo Amazon Android devices (Kindle *)
+ +

Beta branches

+ +We expect that FBReader 2.6 will be released for all Android versions starting from 2.*. However +new UI features (configurable menu, widgets, etc.) will be included into build for Android 3 +and higher only. + + + + + +
2.6icsice-cream-sandwich + 2.6 features
2.6yota2 + 2.6 features
2.6-kindlekindle + 2.6 features
+ +

Merging order

+ + + + + +
master→ice-cream-sandwich→yota2→kindle
↓↓↓
2.6ics→2.6→2.6-kindle
master→nook