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, 13 insertions, 0 deletions

diff --git a/linden/indra/newview/skins/default/xui/nl/menu_login.xml b/linden/indra/newview/skins/default/xui/nl/menu_login.xml
new file mode 100644
index 0000000..188418e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/nl/menu_login.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Login Menu">
+        <menu label="Bestand" name="File">
+                <menu_item_call label="Afsluiten" name="Quit"/>
+        </menu>
+        <menu label="Bewerken" name="Edit">
+                <menu_item_call label="Voorkeuren..." name="Preferences..."/>
+        </menu>
+        <menu label="Help" name="Help">
+                <menu_item_call label="Second Life Help" name="Second Life Help"/>
+                <menu_item_call label="Over Second Life..." name="About Second Life..."/>
+        </menu>
+</menu_bar>