Merge lp://staging/~joelpet/mnemosyne-proj/android into lp://staging/~peter-bienstman/mnemosyne-proj/trunk
Proposed by
Joel Pettersson
| Status: | Merged |
|---|---|
| Merged at revision: | 1941 |
| Proposed branch: | lp://staging/~joelpet/mnemosyne-proj/android |
| Merge into: | lp://staging/~peter-bienstman/mnemosyne-proj/trunk |
| Diff against target: |
2740 lines (+100/-2560) 11 files modified
.bzrignore (+96/-0) mnemosyne/mnemosyne/android/.idea/.name (+0/-1) mnemosyne/mnemosyne/android/.idea/gradle.xml (+0/-19) mnemosyne/mnemosyne/android/.idea/misc.xml (+0/-16) mnemosyne/mnemosyne/android/.idea/vcs.xml (+0/-6) mnemosyne/mnemosyne/android/.idea/workspace.xml (+0/-2410) mnemosyne/mnemosyne/android/app/app.iml (+0/-93) mnemosyne/mnemosyne/android/app/build.gradle (+1/-1) mnemosyne/mnemosyne/android/build.gradle (+1/-1) mnemosyne/mnemosyne/android/gradle/wrapper/gradle-wrapper.properties (+2/-2) mnemosyne/mnemosyne/android/local.properties (+0/-11) |
| To merge this branch: | bzr merge lp://staging/~joelpet/mnemosyne-proj/android |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Peter Bienstman | Pending | ||
|
Review via email:
|
|||
Description of the change
Cleaned out and ignored generated, binary, local, and user-specific files etc. so that another developer may simply pick up the project and start working right away.
The project has also been prepared for Android Studio 2.0, which has now been released to the stable channel. This was done by upgrading build tools, the Gradle wrapper and the Android Gradle plugin.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
