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 order

Browse source
This commit is contained in:
Nikolay Pultsin 2013-01-20 05:16:16 +04:00
parent 5c01bea10a
commit c207b09df5
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mergeAll.sh
View file

@ -13,14 +13,14 @@ git checkout beta
git merge multidirs git merge multidirs
git checkout beta-ics git checkout beta-ics
git merge ice-cream-sandwich
git merge beta git merge beta
git merge ice-cream-sandwich
git checkout library-service git checkout library-service
git merge master git merge master
git checkout library-service-ics git checkout library-service-ics
git merge ice-cream-sandwich
git merge library-service git merge library-service
git merge ice-cream-sandwich
git checkout master git checkout master