Browse code 合并冲突 master
commit f7008093e6587567a675472152a58d70d151359b 2 parents 0d233e3 + 73bf9a4 黄旋科 authored on 12 Nov 2017

Showing 17 changed files

• TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
• TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
• TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
• TMessagesProj/src/main/res/drawable-xhdpi/add_user.png
• TMessagesProj/src/main/res/drawable-xhdpi/default_login_normal.png
• TMessagesProj/src/main/res/drawable-xhdpi/default_login_press.png
• TMessagesProj/src/main/res/drawable-xhdpi/default_signin_normal.png
• TMessagesProj/src/main/res/drawable-xhdpi/default_signin_press.png
• TMessagesProj/src/main/res/drawable-xhdpi/ic_default.png
• TMessagesProj/src/main/res/drawable-xxhdpi/default_login_normal.png
• TMessagesProj/src/main/res/drawable-xxhdpi/default_login_press.png
• TMessagesProj/src/main/res/drawable-xxhdpi/default_signin_normal.png
• TMessagesProj/src/main/res/drawable-xxhdpi/default_signin_press.png
• TMessagesProj/src/main/res/drawable-xxhdpi/ic_default.jpg
• TMessagesProj/src/main/res/drawable/press_login_btn.xml
• TMessagesProj/src/main/res/drawable/press_signin_btn.xml
• TMessagesProj/src/main/res/layout/activity_no_login.xml

Ignore Space Show notes View TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java

Ignore Space Show notes View TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java

Ignore Space Show notes View TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/add_user.png 100755 → 100644
File mode changed

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/default_login_normal.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/default_login_press.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/default_signin_normal.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/default_signin_press.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xhdpi/ic_default.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xxhdpi/default_login_normal.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xxhdpi/default_login_press.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xxhdpi/default_signin_normal.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xxhdpi/default_signin_press.png 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable-xxhdpi/ic_default.jpg 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable/press_login_btn.xml 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/drawable/press_signin_btn.xml 0 → 100644

Ignore Space Show notes View TMessagesProj/src/main/res/layout/activity_no_login.xml 0 → 100644

Show line notes below