Or you can just keep pushing new commits until we're ready to merge, and
then rebase/squash them down.

- moxie

On 11/06/2013 10:27 AM, Thomas Grainger wrote:
> In src/org/thoughtcrime/securesms/ConversationActivity.java:
> 
>> @@ -630,7 +631,16 @@ private void initializeResources() {
>>  
>>      recipientsPanel.setPanelChangeListener(new RecipientsPanelChangeListener());
>>      sendButton.setOnClickListener(sendButtonListener);
>> -    sendButton.setEnabled(true);
>> +    // Only enable send button if version is >4.4 and default sms app
> 
> git rebase is your friend
> …
> On 6 Nov 2013 18:14, "vetsin" <notifications@github.com> wrote: In
> src/org/thoughtcrime/securesms/ConversationActivity.java: > @@ -630,7
> +631,16 @@ private void initializeResources() { > >
> recipientsPanel.setPanelChangeListener(new
> RecipientsPanelChangeListener()); >
> sendButton.setOnClickListener(sendButtonListener); > -
> sendButton.setEnabled(true); > + // Only enable send button if version
> is >4.4 and default sms app A misunderstanding of the docs on my part,
> i'll go ahead and fix all such things. Once I figure out how to do it
> properly with git here... — Reply to this email directly or view it on
> GitHub<https://github.com/WhisperSystems/TextSecure/pull/411/files#r7472402>
> .
> 
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/WhisperSystems/TextSecure/pull/411/files#r7472860>.
> 

-- 
http://www.thoughtcrime.org