yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ice-cream-sandwich

Browse source
This commit is contained in:
Nikolay Pultsin 2015-08-22 15:08:38 +01:00
commit f1a6f0ddba
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mergeAll.sh
View file

@ -31,4 +31,8 @@ git checkout 2.6
git merge 2.6ics git merge 2.6ics
git merge yota2 git merge yota2
git checkout 2.6-kindle
git merge 2.6
git merge kindle
git checkout master git checkout master