Index: CodeBlocks-unix.cbp
===================================================================
--- CodeBlocks-unix.cbp    (revision 6758)
+++ CodeBlocks-unix.cbp    (working copy)
@@ -398,6 +398,25 @@
                     <Add directory="devel" />
                 </Linker>
             </Target>
+            <Target title="Abbreviations">
+                <Option output="devel/share/codeblocks/plugins/libabbreviations.so" prefix_auto="0" extension_auto="0" />
+                <Option working_dir="devel/share/codeblocks/plugins" />
+                <Option type="3" />
+                <Option compiler="gcc" />
+                <Option projectLinkerOptionsRelation="1" />
+                <Compiler>
+                    <Add directory="include" />
+                    <Add directory="include/scripting/include" />
+                    <Add directory="include/scripting/sqplus" />
+                    <Add directory="include/scripting/bindings" />
+                </Compiler>
+                <Linker>
+                    <Add option="`wx-config --libs`" />
+                    <Add library="codeblocks" />
+                    <Add library="wxscintilla" />
+                    <Add directory="devel" />
+                </Linker>
+            </Target>
             <Environment>
                 <Variable name="WX_SUFFIX" value="u" />
                 <Variable name="WX_VERSION" value="28" />
@@ -405,7 +424,7 @@
             </Environment>
         </Build>
         <VirtualTargets>
-            <Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;AStyle;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Projects-workspaces importer;Scripted wizard;Open files list;To-do;Autosave;" />
+            <Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;AStyle;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Projects-workspaces importer;Scripted wizard;Open files list;To-do;Autosave;Abbreviations;" />
             <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Projects-workspaces importer;Scripted wizard;Open files list;To-do;" />
             <Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;Compiler depslib;" />
         </VirtualTargets>
@@ -973,6 +992,18 @@
         <Unit filename="include/xtra_res.h">
             <Option target="sdk" />
         </Unit>
+        <Unit filename="plugins/abbreviations/abbreviations.cpp">
+            <Option target="Abbreviations" />
+        </Unit>
+        <Unit filename="plugins/abbreviations/abbreviations.h">
+            <Option target="Abbreviations" />
+        </Unit>
+        <Unit filename="plugins/abbreviations/abbreviationsconfigpanel.cpp">
+            <Option target="Abbreviations" />
+        </Unit>
+        <Unit filename="plugins/abbreviations/abbreviationsconfigpanel.h">
+            <Option target="Abbreviations" />
+        </Unit>
         <Unit filename="plugins/astyle/asstreamiterator.cpp">
             <Option target="AStyle" />
         </Unit>
Index: CodeBlocks.cbp
===================================================================
--- CodeBlocks.cbp    (revision 6758)
+++ CodeBlocks.cbp    (working copy)
@@ -1,3454 +1,3492 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-    <FileVersion major="1" minor="6" />
-    <Project>
-        <Option title="Code::Blocks" />
-        <Option pch_mode="2" />
-        <Option default_target="src" />
-        <Option compiler="gcc" />
-        <Build>
-            <Target title="exchndl">
-                <Option platforms="Windows;" />
-                <Option output="devel\exchndl" prefix_auto="0" extension_auto="1" />
-                <Option working_dir="devel" />
-                <Option type="3" />
-                <Option compiler="gcc" />
-                <Compiler>
-                    <Add directory="base\exchndl\include" />
-                </Compiler>
-                <Linker>
-                    <Add library="bfd" />
-                    <Add library="iberty" />
-                    <Add directory="base\exchndl\lib" />
-                </Linker>
-            </Target>
-            <Target title="tinyXML">
-                <Option output="base\tinyxml\libtxml.a" prefix_auto="0" extension_auto="0" />
-                <Option working_dir="" />
-                <Option type="2" />
-                <Option compiler="gcc" />
-                <Compiler>
-                    <Add directory="include\tinyxml" />
-                </Compiler>
-                <Linker>
-                    <Add option="-r" />
-                </Linker>
-            </Target>
-            <Target title="A
download for full patch...