master: New: reminder section named and computer dependent part introduced, android SDK set
master: Fix: ANDROID_HOME and PATH updated
master: Merge origin/master master # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is ahead of 'origin/master' by 3 commits. # # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: .bash_profile # modified: .git-template/hooks/commit-msg # modified: .gitconfig #
master: New: emacs autocorrect line ending added
master: Merge branch 'master' of github.com:fallen-s4e/emacs-config Conflicts: .bash_profile