Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test change #2

Merged
merged 2 commits into from
Jul 9, 2012
Merged

Test change #2

merged 2 commits into from
Jul 9, 2012

Conversation

bholt
Copy link
Member

@bholt bholt commented Jul 9, 2012

I just added:

  • a test comment that says:
// test comment

@@ -46,6 +46,8 @@
#include <gperftools/profiler.h>
#endif

// test change
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, seems a bit superflous.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I DISAGREE

@@ -50,4 +52,4 @@ To break that down a bit:

Other options for compiling, etc:

* Compile with DEBUG=1 to get debugging symbols, less variables optimized out, etc.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, why is this here?

@bholt
Copy link
Member Author

bholt commented Jul 9, 2012

Well, seems alright to me! Any objections? We should combine these two into a single commit if possible...

@nelsonje
Copy link
Member

nelsonje commented Jul 9, 2012

Hmmm. not sure

nelsonje added a commit that referenced this pull request Jul 9, 2012
@nelsonje nelsonje merged commit ee15691 into uwsampa:master Jul 9, 2012
@kalginkv kalginkv mentioned this pull request Mar 12, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants