添加了小米便签应用锁 #12

Open

peb579c3i wants to merge 0 commits from mengbo_branch into develop

peb579c3i commented

Owner

There is no content yet.

peb579c3i added 4 commits

41aabb009e 合并了更改背景图片和其他功能

3a15914218 添加未添加完的文件

e15461041b 修改了背景图片的一些bug

a27f02b216 画板类-背景图片-密码登录，更改，删除

p97ohblyn added 3 commits

a189d0d783 Merge pull request '更改背景图片' (#7 ) from mengbo_branch into master

更改背景图片

9c174764dd Merge pull request '合并添加图片，画板，改背景' (#8 ) from develop into master

b8a45e08e8 Merge branch 'master' of https://bdgit.educoder.net/peb579c3i/dingruihua_mimaintain into mengbo_branch

# Conflicts:
#	src/main/java/net/micode/notes/ui/NotesListActivity.java
#	src/main/res/drawable-hdpi/menu_lover.png
#	src/main/res/drawable-hdpi/menu_young.png
#	src/main/res/menu/note_list.xml
#	src/main/res/values/strings.xml

p97ohblyn added 1 commit

f47ff4f4e3 修改了密码有关的bug

This pull request can be merged automatically.

This branch is out-of-date with the base branch

The changes on this branch are already on the target branch. This will be an empty commit.

You are not authorized to merge this pull request.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: peb579c3i/dingruihua_mimaintain#12