yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

ics first

Browse source
This commit is contained in:
Nikolay Pultsin 2012-04-21 08:57:04 +01:00
parent 49a558fae7
commit da8a8d44af
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/mergeAll.sh
View file

@ -10,15 +10,15 @@ git checkout beta
git merge master
git checkout beta-ics
git merge beta
git merge ice-cream-sandwich
git merge beta
git checkout booksdb
git merge master
git checkout booksdb-ics
git merge booksdb
git merge ice-cream-sandwich
git merge booksdb
git checkout library-service-ics
git merge booksdb-ics
@ -27,8 +27,8 @@ git checkout epub-native
git merge master
git checkout epub-native-ics
git merge epub-native
git merge ice-cream-sandwich
git merge epub-native
git checkout multidirs
git merge master