Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 1 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index d4d74cb..bb2c083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ linden/indra/viewer-*
 linden/indra/build-*
 linden/installed.xml
 *.pyc
+pdb_files/*.pdb
 
 
 # PATCHES
@@ -39,5 +40,4 @@ ChangeLog.txt
 .DS_Store
 *.zip
 linden/indra/newview/mozilla-universal-darwin.tgz
-linden/indra/newview/hide