3 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b8eba81..e0e8200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,43 +1,54 @@
-        2004-??-??Opie
+        2005-??-??Opie 1.2.0
+
+        New Features
+        ------------
+
+        Fixed Bugs
+        ----------
+
+        Internal
+        --------
+
+        2004-11-26Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
         * PackageManager supports linking of applications to root (drw)
         * PackageManager supports src/gz feeds (drw,wimpie)
         * Add a syslog information tab to sysinfo (mickeyl)
         * Add new, more consistent, PIM icons + a GIMP teplate (ar)
 
         Fixed Bugs
         ----------
         * #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
         * #1269 - VCards were imported into personal area if it was activated (eilers)
         * #1464 - Packagemanager dont set active filter after install a package (drw)
+        * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
         * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
         * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
-        * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
-        * n.a. - Battery Applet - fix sizing of battery info popup
+        * n.a. - Battery Applet - fix sizing of battery info popup (drw)
 
         Internal
         --------
         * Moved libopie1 to unsupported (mickeyl)
         * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
         * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
 
         2004-11-14Opie 1.1.7
 
         New Features
         ------------
         * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
         * Backup now uses the busy indicator when backing up and restore (ar)
         * OpiePlayer2 gained adding of Directories to the playlist (zecke)
         * OpiePlayer2 better error handling (zecke)
         * OpiePlayer2 progress indication while streaming (zecke)
         * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
         * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
         * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
         * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
         * Opie-Console use Custom Font and Size in a Profile (harlekin)
         * Opie-Console transparently log the Output and Input to a file (harlekin)
         * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
         * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
diff --git a/core/applets/aboutapplet/widget.ui b/core/applets/aboutapplet/widget.ui
index 4091c3c..beefedc 100644
--- a/core/applets/aboutapplet/widget.ui
+++ b/core/applets/aboutapplet/widget.ui
@@ -21,49 +21,49 @@
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>1</number>
         </property>
         <widget row="0"  column="0"  rowspan="1"  colspan="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.7&lt;/b&gt;&lt;/center&gt;</string>
+                <string>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</string>
             </property>
         </widget>
         <widget row="1"  column="1" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>About</string>
                 </attribute>
diff --git a/library/version.h b/library/version.h
index 0eb7cb6..142d4ac 100644
--- a/library/version.h
+++ b/library/version.h
@@ -1,3 +1,3 @@
 #define QPE_VENDOR "Project Opie"
-#define QPE_VERSION "1.1.7-snapshot"
+#define QPE_VERSION "1.1.8"
 #define SUB_VERSION ""