merge

2013-05-02 14:38:49 -05:00 · 2013-05-02 14:38:49 -05:00 · ff3cc0a05e
commit ff3cc0a05e
parent a50ffb5de5 70397fe3bd
2 changed files with 24133 additions and 24133 deletions
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp
@ -84,7 +84,7 @@ namespace GUIEditor
 		CInterfaceGroup *mg = CWidgetManager::getInstance()->getMasterGroupFromId( masterGroup );
 		if( mg != NULL )
 		{
-			QTreeWidgetItem *item = new QTreeWidgetItem( NULL );
+			QTreeWidgetItem *item = new QTreeWidgetItem( static_cast<QTreeWidgetItem*>(NULL) );
 			item->setText( 0, "ui" );
 			widgetHT->addTopLevelItem( item );

--- a/code/web/api/server/scripts/achievement_script/_test/char_346.xml
+++ b/code/web/api/server/scripts/achievement_script/_test/char_346.xml