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

master | this branch is used for android 2.* builds
ice-cream-sandwich | this branch contains all code for android 3/4/5 releases except yotaphone 1 code that requires a non-free (?) yota SDK
yota2 | ice-cream-sandwich + yotaphone 1 code; used for official android 3/4/5 builds
nook | this branch is used for Nook Simple Touch version builds
kindle | this 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.6ics | ice-cream-sandwich + 2.6 features
2.6 | yota2 + 2.6 features
2.6-kindle | kindle + 2.6 features

## Merging order

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