Ignore:
Timestamp:
08/01/13 08:33:40 (9 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, RawEEG, Servo, Tab_Interface, pyramid
Children:
c1c6a1d
Parents:
4da9757 (diff), ce0a7ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'RawEEG', remote-tracking branch 'origin' into RawEEG

File:
1 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/controllers/SupportViewController.m

    rab9d63b rce0a7ee  
    3333} 
    3434 
    35 - (void)didReceiveMemoryWarning 
    36 { 
    37     [super didReceiveMemoryWarning]; 
    38     // Dispose of any resources that can be recreated. 
    39 } 
    40  
    4135#pragma mark UIWebViewDelegate methods 
    4236 
    43 - (void)webViewDidStartLoad:(UIWebView *)webView 
     37- (void)webViewDidFinishLoad:(UIWebView *)webView 
    4438{ 
    4539    retryButton.hidden = YES; 
Note: See TracChangeset for help on using the changeset viewer.