Pull request for MobiPerf v0.1 Beta #23
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Static reference to account to be used.
|
Seems still can't be merged. |
…biperf-master Conflicts: .gitignore
|
OK, now it can be automatically merged after I made a pull request from Main to my local branch and I merge the new updates from the main brach. |
mdwelsh
pushed a commit
that referenced
this pull request
Apr 12, 2012
Pull request for MobiPerf v0.1 Beta
|
Have you tested that this all works when built from exactly these sources? |
|
I've tested building from these sources, and AFAICT, it is working |
| @@ -21,3 +21,4 @@ server/dev_data/ | |||
|
|
|||
| # Random evil files | |||
| *.DS_Store | |||
| android/*/*/.DS_Store | |||
There was a problem hiding this comment.
Gigantic code review so this is a low priority thing to catch, but I wanted to alert @quietbamboo about this. This is a redundant line. http://linux.die.net/man/5/gitignore
I will fix in my next CL
There was a problem hiding this comment.
You mean "android///.DS_Store" is redundant of "*.DS_Store", right?
I agree. Just remove it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request includes all previous commits.
Appears a little messy here. Will make modularized pull requests from now.