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-19 22:00:44 +04:00
parent 86439a18d7
commit e4b0b64ffa
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/mergeAll.sh
View file

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