Merge remote-tracking branch 'thickbrick/exp' into exp

Conflicts:
	linden/indra/newview/llpanelaudioprefs.cpp
	linden/indra/newview/llpanelaudioprefs.h
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml

1 files changed, 0 insertions, 40 deletions

diff --git a/linden/indra/newview/installers/windows/README.txt b/linden/indra/newview/installers/windows/README.txt
deleted file mode 100644
index c29e858..0000000
--- a/linden/indra/newview/installers/windows/README.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
- ABOUT IMPRUDENCE
-
-   Imprudence is an open source metaverse viewer project based on
-   the Second Life Viewer source.
-
-   The goal of Imprudence is to greatly improve the usability of
-   the Viewer through community involvement, thoughtful design,
-   modern development methods, and a pro-change atmosphere.
-
-   For more information about the rationale, goals, and methods
-   of the Imprudence project, please see MANIFESTO.txt.
-
-   If you would like to get involved with the Imprudence project,
-   please see CONTRIBUTE.txt. There are many ways you can help,
-   no matter your skills or the amount of time you can dedicate.
-
-
-   Imprudence is online at kokuaviewer.org
-
-
-   The latest source code for the Imprudence Viewer is always
-   available at:
-
-     http://github.com/imprudence/imprudence
-
-
- LICENSE
-
-   All code is licensed under the terms of the GNU General Public
-   License version 2.0 (plus a special exception).
-
-   See linden/LICENSE-source.txt for details.
-
-
- DISCLAIMERS AND NOTICES
-
-   Second Life is a registered trademark of Linden Research, Inc.
-
-   Imprudence is in no way affiliated with Linden Research, Inc.