Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

4 files changed, 347 insertions, 47 deletions

diff --git a/extra/codeblocks/.footprint b/extra/codeblocks/.footprint
index a66d52549..76115858a 100644
--- a/extra/codeblocks/.footprint
+++ b/extra/codeblocks/.footprint
@@ -5,11 +5,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/codeblocks
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/codeblocks/
+-rw-r--r--	root/root	usr/include/codeblocks/CharDistribution.h
+-rw-r--r--	root/root	usr/include/codeblocks/JpCntx.h
 -rw-r--r--	root/root	usr/include/codeblocks/annoyingdialog.h
 -rw-r--r--	root/root	usr/include/codeblocks/autodetectcompilers.h
 -rw-r--r--	root/root	usr/include/codeblocks/backgroundthread.h
 -rw-r--r--	root/root	usr/include/codeblocks/base64.h
 -rw-r--r--	root/root	usr/include/codeblocks/blockallocated.h
+-rw-r--r--	root/root	usr/include/codeblocks/cbauibook.h
 -rw-r--r--	root/root	usr/include/codeblocks/cbeditor.h
 -rw-r--r--	root/root	usr/include/codeblocks/cbeditorprintout.h
 -rw-r--r--	root/root	usr/include/codeblocks/cbexception.h
@@ -72,12 +75,33 @@ drwxr-xr-x	root/root	usr/include/codeblocks/
 -rw-r--r--	root/root	usr/include/codeblocks/misctreeitemdata.h
 -rw-r--r--	root/root	usr/include/codeblocks/multiselectdlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/newfromtemplatedlg.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsBig5Prober.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsCharSetProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsCodingStateMachine.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsEUCJPProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsEUCKRProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsEUCTWProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsError.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsEscCharsetProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsGB2312Prober.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsHebrewProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsLatin1Prober.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsMBCSGroupProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsPkgInt.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsSBCSGroupProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsSBCharSetProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsSJISProber.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsUTF8Prober.h
+-rw-r--r--	root/root	usr/include/codeblocks/nsUniversalDetector.h
+-rw-r--r--	root/root	usr/include/codeblocks/nscore.h
 -rw-r--r--	root/root	usr/include/codeblocks/personalitymanager.h
 -rw-r--r--	root/root	usr/include/codeblocks/pipedprocess.h
 -rw-r--r--	root/root	usr/include/codeblocks/pluginmanager.h
 -rw-r--r--	root/root	usr/include/codeblocks/pluginsconfigurationdlg.h
+-rw-r--r--	root/root	usr/include/codeblocks/prcpucfg.h
 -rw-r--r--	root/root	usr/include/codeblocks/prep.h
 -rw-r--r--	root/root	usr/include/codeblocks/printing_types.h
+-rw-r--r--	root/root	usr/include/codeblocks/prmem.h
 -rw-r--r--	root/root	usr/include/codeblocks/projectbuildtarget.h
 -rw-r--r--	root/root	usr/include/codeblocks/projectdepsdlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/projectfile.h
@@ -89,6 +113,7 @@ drwxr-xr-x	root/root	usr/include/codeblocks/
 -rw-r--r--	root/root	usr/include/codeblocks/projectoptionsdlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/projectsfilemasksdlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/projecttemplateloader.h
+-rw-r--r--	root/root	usr/include/codeblocks/prtypes.h
 -rw-r--r--	root/root	usr/include/codeblocks/replacedlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/safedelete.h
 drwxr-xr-x	root/root	usr/include/codeblocks/scripting/
@@ -113,6 +138,7 @@ drwxr-xr-x	root/root	usr/include/codeblocks/scripting/sqplus/
 -rw-r--r--	root/root	usr/include/codeblocks/scripting/sqplus/sqplus.h
 -rw-r--r--	root/root	usr/include/codeblocks/scriptingmanager.h
 -rw-r--r--	root/root	usr/include/codeblocks/scriptsecuritywarningdlg.h
+-rw-r--r--	root/root	usr/include/codeblocks/scrollingdialog.h
 -rw-r--r--	root/root	usr/include/codeblocks/sdk.h
 -rw-r--r--	root/root	usr/include/codeblocks/sdk_common.h
 -rw-r--r--	root/root	usr/include/codeblocks/sdk_events.h
@@ -129,22 +155,36 @@ drwxr-xr-x	root/root	usr/include/codeblocks/tinyxml/
 -rw-r--r--	root/root	usr/include/codeblocks/uservarmanager.h
 -rw-r--r--	root/root	usr/include/codeblocks/virtualbuildtargetsdlg.h
 -rw-r--r--	root/root	usr/include/codeblocks/workspaceloader.h
-drwxr-xr-x	root/root	usr/include/codeblocks/wxFlatNotebook/
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/fnb_customize_dlg.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/fnb_resources.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/fnb_singleton.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/fnb_smart_ptr.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/popup_dlg.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/renderer.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/wxFNBDropTarget.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/wxFlatNotebook.h
--rw-r--r--	root/root	usr/include/codeblocks/wxFlatNotebook/xh_fnb.h
 drwxr-xr-x	root/root	usr/include/codeblocks/wxscintilla/
 drwxr-xr-x	root/root	usr/include/codeblocks/wxscintilla/include/
 drwxr-xr-x	root/root	usr/include/codeblocks/wxscintilla/include/wx/
 -rw-r--r--	root/root	usr/include/codeblocks/wxscintilla/include/wx/wxscintilla.h
 -rw-r--r--	root/root	usr/include/codeblocks/xtra_res.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/codeblocks/
+drwxr-xr-x	root/root	usr/lib/codeblocks/plugins/
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libastyle.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libastyle.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libautosave.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libautosave.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libclasswizard.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libclasswizard.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libcodecompletion.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libcodecompletion.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libcompiler.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libcompiler.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libdebugger.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libdebugger.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libdefaultmimehandler.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libdefaultmimehandler.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libopenfileslist.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libopenfileslist.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libprojectsimporter.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libprojectsimporter.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libscriptedwizard.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libscriptedwizard.so
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libtodo.la
+-rwxr-xr-x	root/root	usr/lib/codeblocks/plugins/libtodo.so
 -rwxr-xr-x	root/root	usr/lib/libcodeblocks.la
 lrwxrwxrwx	root/root	usr/lib/libcodeblocks.so -> libcodeblocks.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libcodeblocks.so.0 -> libcodeblocks.so.0.0.1
@@ -208,12 +248,23 @@ drwxr-xr-x	root/root	usr/share/codeblocks/images/16x16/
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/folder.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/folder_new.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/folder_open.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/folder_yel.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/folder_yel_open.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/goto.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/history_clear.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/idea.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/info.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/mark.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/mark_clear.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/mark_next.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/mark_prev.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/newproject.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/next.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/plug.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/prev.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/project-readonly.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/project.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/projectnew.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/redo.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/run.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/searchreplace.png
@@ -223,11 +274,17 @@ drwxr-xr-x	root/root	usr/share/codeblocks/images/16x16/
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/view_tree.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/window.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/16x16/window_fullscreen.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/workspace-readonly.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/16x16/workspace.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/ascii.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/closebutton.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codeblocks.png
 drwxr-xr-x	root/root	usr/share/codeblocks/images/codecompletion/
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/class.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/class_folder.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/class_private.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/class_protected.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/class_public.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/ctor_private.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/ctor_protected.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/ctor_public.png
@@ -235,8 +292,23 @@ drwxr-xr-x	root/root	usr/share/codeblocks/images/codecompletion/
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/dtor_protected.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/dtor_public.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enum.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enum_private.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enum_protected.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enum_public.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enumerator.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/enums_folder.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder_blue.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder_blue_open.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder_green.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder_green_open.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/folder_open.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/funcs_folder.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/macro.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/macro_folder.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/macro_private.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/macro_protected.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/macro_public.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/method_private.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/method_protected.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/method_public.png
@@ -246,10 +318,14 @@ drwxr-xr-x	root/root	usr/share/codeblocks/images/codecompletion/
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/preproc_folder.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/symbols_folder.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/typedef.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/typedef_private.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/typedef_protected.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/typedef_public.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/typedefs_folder.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/var_private.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/var_protected.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/var_public.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/codecompletion/vars_folder.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/compile.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/compilerun.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/contents_16x16.png
@@ -358,7 +434,8 @@ drwxr-xr-x	root/root	usr/share/codeblocks/images/settings/
 -rw-r--r--	root/root	usr/share/codeblocks/images/settings/wxsmith.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/source.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/splash.png
--rw-r--r--	root/root	usr/share/codeblocks/images/splash_new.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/splash_0802.png
+-rw-r--r--	root/root	usr/share/codeblocks/images/splash_1005.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/stop.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/undo.png
 -rw-r--r--	root/root	usr/share/codeblocks/images/vfolder_open.png
@@ -370,12 +447,16 @@ drwxr-xr-x	root/root	usr/share/codeblocks/lexers/
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_OgreCompositor.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_OgreMaterial.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_OgreMaterial.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_ada.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_ada.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_angelscript.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_angelscript.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_bash.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_bash.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_batch.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_batch.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_caml.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_caml.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_cg.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_cg.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_cpp.sample
@@ -394,12 +475,16 @@ drwxr-xr-x	root/root	usr/share/codeblocks/lexers/
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_glsl.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_gm.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_gm.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_haskell.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_haskell.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_hitasm.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_hitasm.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_html.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_html.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_latex.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_latex.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_lisp.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_lisp.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_lua.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_lua.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_make.sample
@@ -408,10 +493,15 @@ drwxr-xr-x	root/root	usr/share/codeblocks/lexers/
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_masm.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_matlab.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_matlab.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_nassi.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_nsis.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_nsis.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_pascal.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_pascal.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_perl.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_perl.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_postscript.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_postscript.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_prg.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_prg.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_properties.sample
@@ -420,6 +510,12 @@ drwxr-xr-x	root/root	usr/share/codeblocks/lexers/
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_python.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_rc.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_rc.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_ruby.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_ruby.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_smalltalk.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_smalltalk.xml
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_sql.sample
+-rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_sql.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_squirrel.sample
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_squirrel.xml
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_vbscript.sample
@@ -432,29 +528,6 @@ drwxr-xr-x	root/root	usr/share/codeblocks/lexers/
 -rw-r--r--	root/root	usr/share/codeblocks/lexers/lexer_xml.xml
 -rw-r--r--	root/root	usr/share/codeblocks/manager_resources.zip
 -rw-r--r--	root/root	usr/share/codeblocks/openfileslist.zip
-drwxr-xr-x	root/root	usr/share/codeblocks/plugins/
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libastyle.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libastyle.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libautosave.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libautosave.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libclasswizard.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libclasswizard.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libcodecompletion.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libcodecompletion.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libcompiler.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libcompiler.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libdebugger.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libdebugger.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libdefaultmimehandler.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libdefaultmimehandler.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libopenfileslist.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libopenfileslist.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libprojectsimporter.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libprojectsimporter.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libscriptedwizard.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libscriptedwizard.so
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libtodo.la
--rwxr-xr-x	root/root	usr/share/codeblocks/plugins/libtodo.so
 -rw-r--r--	root/root	usr/share/codeblocks/projectsimporter.zip
 -rw-r--r--	root/root	usr/share/codeblocks/resources.zip
 -rw-r--r--	root/root	usr/share/codeblocks/scriptedwizard.zip
@@ -463,6 +536,7 @@ drwxr-xr-x	root/root	usr/share/codeblocks/scripts/
 -rw-r--r--	root/root	usr/share/codeblocks/scripts/gdb_types.script
 -rw-r--r--	root/root	usr/share/codeblocks/scripts/make_dist.script
 -rw-r--r--	root/root	usr/share/codeblocks/scripts/startup.script
+-rw-r--r--	root/root	usr/share/codeblocks/scripts/stl-views-1.0.3.gdb
 -rw-r--r--	root/root	usr/share/codeblocks/scripts/wx_help.script
 -rw-r--r--	root/root	usr/share/codeblocks/start_here.zip
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/
@@ -499,6 +573,11 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sdl.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sdlapp.cbp
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sdlapp.template
+-rw-r--r--	root/root	usr/share/codeblocks/templates/sfml-cb.bmp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/sfml-main.cpp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/sfml.cbp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/sfml.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/sfml.template
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sharedlib-sample.c
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sharedlib.cbp
 -rw-r--r--	root/root	usr/share/codeblocks/templates/sharedlib.template
@@ -506,6 +585,96 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/staticlib.cbp
 -rw-r--r--	root/root	usr/share/codeblocks/templates/staticlib.template
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/h/evaluator7t.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/ld/target.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ARM-eval7t/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/h/at91sam7a3.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/h/sam7a3ek.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/ld/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/ld/targetRAM.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/ek-at91sam7a3/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/h/arm9_mm.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/h/lh7a404.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/h/lpd404.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/ld/target.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/src/lh7a404_mm.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/lpd-lh7a404/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/h/at91sam7sx.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/h/sam7p64.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/ld/target_s128.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/ld/target_s256.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/ld/target_s32.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/ld/target_s64.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-at91sam7sx/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/h/lpc-p2138.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/h/lpc213x.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/ld/target_2132.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/ld/target_2134.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/ld/target_2136.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/ld/target_2138.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/olimex-lpc213x/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/h/at91m55800.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/ld/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/ld/targetRAM_1MB.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/ld/targetRAM_512kB.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/ld/targetROM.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-AT91M55800/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/h/lpc2294.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/ld/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/ld/targetRAM_1MB.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/ld/targetROM.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-LPC2294/src/vectors.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/h/pxa255regs.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/h/pxa_mm.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/ld/target.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/src/irq.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/src/pxa_mm.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/files/phyCORE-PXA255/src/vectors.S
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/logo.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/arm/wizard.script
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/avr/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/avr/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/avr/files/main.c
@@ -534,8 +703,10 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/d/console/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/d/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/d/wizard.script
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/directx/
-drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/directx/files/
--rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/files/main.cpp
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/directx/dx8/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/dx8/main.cpp
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/directx/dx9/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/dx9/main.cpp
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/directx/wizard.script
@@ -603,6 +774,16 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/lf/files/structured/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/lf/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/lf/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/lf/wizard.script
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/lf/wizard.xrc
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/files/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/files/lccstub.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/files/mexversion.rc
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/files/sfuntmpl.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/logo.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/wizard.script
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/matlab_csf/wizard.xrc
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ogre/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ogre/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ogre/files/main.cpp
@@ -632,6 +813,27 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/plugins/templates/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/plugins/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/plugins/wizard.script
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/plugins/wizard.xrc
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/ld/target.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/src/crt0.S
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC5200/src/traptable.S
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/h/mpc5200.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/h/mpc555.h
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/ld/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/ld/target.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/src/crt0.S
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/files/MPC565/src/main.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/logo.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/ppc/wizard.script
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/qt4/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/qt4/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/qt4/files/main.cpp
@@ -645,9 +847,18 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sdl/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sdl/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sdl/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sdl/wizard.script
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sfml/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sfml/files/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sfml/files/cb.bmp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sfml/files/main.cpp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sfml/logo.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sfml/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sfml/wizard.script
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sharedlib/
-drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sharedlib/files/
--rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/files/main.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sharedlib/c/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/c/main.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sharedlib/cpp/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/cpp/main.cpp
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sharedlib/wizard.script
@@ -663,12 +874,102 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/staticlib/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/staticlib/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/staticlib/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/staticlib/wizard.script
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/stlport/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/stlport/files/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/stlport/files/main.cpp
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/stlport/logo.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/stlport/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/stlport/wizard.script
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sys/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/sys/files/
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sys/files/driver.c
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sys/logo.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sys/wizard.png
 -rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/sys/wizard.script
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/logo.png
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyKit-TC1767/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyKit-TC1767/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyKit-TC1767/targetIntResources.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/h/easyrun_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/EasyRun-TC1796/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1130/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1161/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1161/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1161/targetIntResources.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1162/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1162/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1162/targetIntResources.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1762/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1762/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1762/targetIntResources.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1765/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1766/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1766/target.ld
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1766/targetIntResources.ld
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1775/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1792/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/memoryROM-intern.x
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1796/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/memoryROM-intern.x
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1797/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/h/triboard_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/TriBoard-TC1920/src/setup.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/main.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/h/phycore_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1130/src/setup.c
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/h/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/h/phycore_setup.h
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/memoryROM.x
+drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/src/
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/templates/phyCORE-TC1775/src/setup.c
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/wizard.png
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/wizard.script
+-rw-r--r--	root/root	usr/share/codeblocks/templates/wizard/tricore/wizard.xrc
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/win32gui/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/win32gui/files/
 drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/win32gui/files/dialog/
@@ -722,11 +1023,11 @@ drwxr-xr-x	root/root	usr/share/codeblocks/templates/wizard/wxwidgets/wxsmith/
 -rw-r--r--	root/root	usr/share/codeblocks/tips.txt
 -rw-r--r--	root/root	usr/share/codeblocks/todo.zip
 drwxr-xr-x	root/root	usr/share/icons/
-drwxr-xr-x	root/root	usr/share/icons/gnome/
-drwxr-xr-x	root/root	usr/share/icons/gnome/48x48/
-drwxr-xr-x	root/root	usr/share/icons/gnome/48x48/mimetypes/
--rw-r--r--	root/root	usr/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-codeblocks-workspace.png
--rw-r--r--	root/root	usr/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-codeblocks.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/mimetypes/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/mimetypes/application-x-codeblocks-workspace.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/mimetypes/application-x-codeblocks.png
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/cb_console_runner.1.gz
diff --git a/extra/codeblocks/.md5sum b/extra/codeblocks/.md5sum
index 26da25aae..4696e4bc4 100644
--- a/extra/codeblocks/.md5sum
+++ b/extra/codeblocks/.md5sum
@@ -1,2 +1 @@
-ac15b4b3de50d7650c2f7a8dbcb30f88  codeblocks-8.02-src.tar.bz2
-b39768be2bbd078b196d5948cbe35f2b  gcc44.patch
+57e41b33a37f2677e432b47e89e939e3  codeblocks-10.05-1debian-src.tar.bz2
diff --git a/xfce/xfce4-fsguard-plugin/.md5sum b/xfce/xfce4-fsguard-plugin/.md5sum
index 5a73f737d..04df1b1ae 100644
--- a/xfce/xfce4-fsguard-plugin/.md5sum
+++ b/xfce/xfce4-fsguard-plugin/.md5sum
@@ -1 +1 @@
-9904837616dd7894a6137d919cb3f355  xfce4-fsguard-plugin-0.4.1.tar.bz2
+50e9d133fd8af1bf5acc3059872eb924  xfce4-fsguard-plugin-0.4.2.tar.bz2
diff --git a/xfce/xfce4-fsguard-plugin/Pkgfile b/xfce/xfce4-fsguard-plugin/Pkgfile
index bc8acfa7c..102fd6f83 100644
--- a/xfce/xfce4-fsguard-plugin/Pkgfile
+++ b/xfce/xfce4-fsguard-plugin/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: xfce4-panel
 
 name=xfce4-fsguard-plugin
-version=0.4.1
+version=0.4.2
 release=1
 source=(http://goodies.xfce.org/releases/$name/$name-$version.tar.bz2)