diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-07-03 19:35:15 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-07-03 19:35:15 -0400 |
| commit | 10f9264f7b25dcd8591c965e8af83e0d9c260636 (patch) | |
| tree | a2a2f37da48038d683587d599f888caba8c226d9 | |
| parent | d8e32c58ce020f4d26af417d927a266209a40483 (diff) | |
| parent | f42d17f6c1d206a3396d9b4629246c4778ae1ca8 (diff) | |
Merge. Same repo - mix of windows and linux work.
| -rwxr-xr-x | indra/newview/llappcorehttp.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp index 70e349e33d..0c242e57db 100755 --- a/indra/newview/llappcorehttp.cpp +++ b/indra/newview/llappcorehttp.cpp @@ -71,7 +71,6 @@ static const struct } }; -static void teleport_started(); static void setting_changed(); |