Merge. Same repo - mix of windows and linux work.

Wed, 03 Jul 2013 19:35:15 -0400

author
Monty Brandenberg <monty@lindenlab.com>
date
Wed, 03 Jul 2013 19:35:15 -0400
changeset 40692
c7519f1e63cf
parent 40691
0dc3766d2ff3
parent 40690
749d1e12fc55
child 40693
206b5cdfe4d5

Merge. Same repo - mix of windows and linux work.

     1.1 --- a/indra/newview/llappcorehttp.cpp	Wed Jul 03 15:17:26 2013 -0400
     1.2 +++ b/indra/newview/llappcorehttp.cpp	Wed Jul 03 19:35:15 2013 -0400
     1.3 @@ -71,7 +71,6 @@
     1.4  	}
     1.5  };
     1.6  
     1.7 -static void teleport_started();
     1.8  static void setting_changed();
     1.9  
    1.10  

mercurial