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

merge order

Browse source
This commit is contained in:
Nikolay Pultsin 2012-05-03 23:54:43 +01:00
parent 881e0bfcce
commit 584559c686
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/mergeAll.sh
View file

@ -6,12 +6,15 @@ git merge master
git checkout ice-cream-sandwich git checkout ice-cream-sandwich
git merge master git merge master
git checkout beta git checkout multidirs
git merge master git merge master
git checkout beta
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 booksdb git checkout booksdb
git merge master git merge master
@ -23,7 +26,4 @@ git merge booksdb
git checkout library-service-ics git checkout library-service-ics
git merge booksdb-ics git merge booksdb-ics
git checkout multidirs
git merge master
git checkout master git checkout master