Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'Dowork/master'
# Conflicts: # app/build.gradle # app/src/main/java/com/pangbai/dowork/Command/CommandBuilder.java # app/src/main/java/com/pangbai/dowork/MainActivity.java # app/src/main/java/com/pangbai/dowork/SettingsActivity.java # app/src/main/java/com/pangbai/dowork/TermActivity.java # app/src/main/java/com/pangbai/dowork/fragment/containerFragment.java # app/src/main/java/com/pangbai/dowork/fragment/settingFragment.java # app/src/main/java/com/pangbai/dowork/tool/containerInfor.java # app/src/main/java/com/pangbai/dowork/tool/ctAdapter.java # app/src/main/java/com/pangbai/dowork/tool/util.java # app/src/main/java/com/pangbai/view/SuperTerminalView.java # app/src/main/res/layout/fragment_container.xml # app/src/main/res/layout/fragment_dashboard.xml # app/src/main/res/layout/list_container.xml
- Loading branch information