Merge in HEAD, up to 9866.

This commit is contained in:
Colin Kuskie 2009-03-17 23:45:21 +00:00
parent c7a66861a6
commit 2bd7a60a01
107 changed files with 6258 additions and 2436 deletions

View file

@ -331,6 +331,13 @@
"url" : "^PageUrl(\"\",op=assetManager);",
"title" : "^International(assets,Asset);"
},
"assetHistory" : {
"icon" : "assetHistory.gif",
"groupSetting" : "groupIdAdminHistory",
"uiLevel" : 5,
"url" : "^PageUrl(\"\",op=assetHistory);",
"title" : "^International(assetHistory,Asset);"
},
"graphics" : {
"icon" : "graphics.gif",
"uiLevel" : 5,
@ -902,6 +909,7 @@
"WebGUI::Content::AssetDiscovery",
"WebGUI::Content::AjaxI18N",
"WebGUI::Content::Account",
"WebGUI::Content::AssetHistory",
"WebGUI::Content::Operation",
"WebGUI::Content::Setup",
"WebGUI::Content::Shop",