[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [orbot/master] Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded
From: n8fr8@xxxxxxxxxxxxxx
Date: Mon, 14 Jul 2014 17:40:20 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 14 Jul 2014 13:40:32 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Amogh Pradeep <amoghbl1@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 758633c9e6471de28dcea1d63484e477a63555b7
Merge: 99dfdd7 c111030
Author: Amogh Pradeep <amoghbl1@xxxxxxxxx>
Date:   Thu May 29 05:02:08 2014 +0530

    Merge branch 'master' of https://github.com/n8fr8/orbot into new_notification_expanded

 res/drawable/icon_story_maker.png                    |  Bin 0 -> 4290 bytes
 res/layout/layout_wizard_tips.xml                    |   11 ++++++++++-
 res/values/strings.xml                               |    2 ++
 src/org/torproject/android/wizard/TipsAndTricks.java |   12 ++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits