Telegram app

Merge lp:~libqtelegram-team/telegram-app/git-reset-hard-the-libraries-to-stable-version into lp:telegram-app

  1. git-reset-hard-the-libraries-to-stable-version
  2. Merge into telegram
Proposed by Jin
Status: Merged
Approved by: Jin
Approved revision: 217
Merged at revision: 217
Proposed branch: lp:~libqtelegram-team/telegram-app/git-reset-hard-the-libraries-to-stable-version
Merge into: lp:telegram-app
Diff against target: 20 lines (+6/-0)
1 file modified
buildScripts/bootstrap.sh (+6/-0)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/git-reset-hard-the-libraries-to-stable-version
Reviewer Review Type Date Requested Status
Ash Approve
Paz Chauhan Approve
Roberto Mier Escandon (community) Approve
libqtelegram team Pending
Review via email: mp+299269@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

looks fine, though not tested

review: Approve
Revision history for this message
Paz Chauhan (paz-chauhan) wrote :

Tested on both desktop and mobile. Works fine.

review: Approve
Revision history for this message
Ash (ashley-richards) wrote :

Works well and no longer get any errors building. Thanks Jin.

review: Approve
Revision history for this message
Jin (jindallo) wrote :

Thanks guys,
I will do merging now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildScripts/bootstrap.sh'
2--- buildScripts/bootstrap.sh 2016-01-19 14:21:34 +0000
3+++ buildScripts/bootstrap.sh 2016-07-06 07:34:23 +0000
4@@ -10,10 +10,16 @@
5
6 if [ ! -d "libqtelegram-ae" ]; then
7 git clone https://github.com/Aseman-Land/libqtelegram-aseman-edition.git libqtelegram-ae
8+ cd libqtelegram-ae
9+ git reset --hard 7bc3c3d54c744d675aa261bd4a0d335291052ee6
10+ cd $TG_DIR/deps
11 fi
12
13 if [ ! -d "TelegramQML" ]; then
14 git clone https://github.com/Aseman-Land/TelegramQML.git
15+ cd TelegramQML
16+ git reset --hard 7d5110a454af7d9be2370da6de217941bb9d1f1b
17+ cd $TG_DIR/deps
18 fi
19
20 echo "Building libqtelegram"

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: