- closed a couple of bugs and added them to changelog

- tagged 1.1.4 in CVS
- bumped version to 1.1.5-snapshot

2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 80069ab..593f6e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,64 +1,74 @@
 2004-??-??	The Opie Team <opie@handhelds.org>
 
+	* Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
+	* Integrated the new security framework into libopie2 (zecke)
+	* Converted the launcher to use the new security framework (zecke)
+
+2004-07-06	The Opie Team <opie@handhelds.org>
+
+	* Tagged as Version 1.1.4 (devel)
+
 	New Features
 	------------
 	* Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
 	* Added Conversion tool for pim-data (eilers)
 	* Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
 	* Modified the PIM API for providing generic use of OPimRecords (eilers)
 	* Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
     
 	Fixed Bugs
 	--------
 	* #1068 - Country Drop Down Box Off Screen
+	* #1291 - Opie tinykate does not open .desktop files (ar)
+	* #1291 - Opie sheet not saving correctly (ar)
 	* #1294 - Opie does not know about British Summer Time
 	* #1314 - Drawpad initialization (mickeyl)
 	* #1317 - Packagemanager crashes on hold-down or install (chicken)
 	* #1321 - Batteryapplet graphic glitch (harlekin)
 	* #1324 - ZSafe not starting up (mickeyl)
 	* #1328 - Personal Home Address fields is trimmed to 1char (eilers)
 	* #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
 	* #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
 	* #1348 - Datebook dependency on libopiedb2 (chicken)
 	+ #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
 
-2004-25-04	The Opie Team <opie@handhelds.org>
+2004-04-25	The Opie Team <opie@handhelds.org>
 
 	* Released as Version 1.1.3 (devel)
 	* Introduced first implementation of SQL-Support using SQLite (eilers)
 	* Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
 	* Added a real system graffiti character set (brad)
 	* Added Generic Keyconfig Widget (zecke)
 	* Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
 	* Added new Bible reader app - opie-dagger (drw)
 	* Added a new Image Viewer. Work is ongoing (zecke,alwin)
 	* Added namespace usage in libopie2 and everywhere (zecke,alwin)
 	* Enabled the possibility to pass command line arguments to applications (mickeyl)
 	* Added an about applet showing some credits and information about Opie (mickeyl)
 	* Added benchmarking functionality to sysinfo (mickeyl)
 	* Added applet and configuration application for switching hardware keyboard layouts (alwin)
 	* Ported applications from libopie1 to libopie2* (drw,ar,alwin)
 	* Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
 	* Clean-up of package information in control files (drw)
 	* Repaired mediummount which was broken since integrating the quicklauncher (alwin)
 	* Improved big-screen support (zecke,ar)
 	* Improved multikeyboard support, added keyboard layout switching applet (mouse)
 	* Added a new mail client based on libetpan (harlekin,alwin,jgf)
 	* Added new package manager - opie-packagemanager (drw)
 	* Improved light-n-power for C7x0 (mickeyl)
 	* Added automatic rotation support for C7x0 (treke)
 	* Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
 	* Added scanning the wireless network neighbourhood to networksettings (mickeyl)
 
 2003-11-29	The Opie Team <opie@handhelds.org>
 
 	* Released as Version 1.0.3
 	* Improved i18n (various contributors)
 	* Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
 	* Made the Documents Tab optional (mickeyl)
 	* Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
 
 2003-08-04	The Opie Team <opie@handhelds.org>
 
 	* Released as Version 1.0.0
 	* Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/library/version.h b/library/version.h
index bc739a3..ab54651 100644
--- a/library/version.h
+++ b/library/version.h
@@ -1,3 +1,3 @@
 #define QPE_VENDOR "Project Opie"
-#define QPE_VERSION "1.1.4-snapshot"
+#define QPE_VERSION "1.1.5-snapshot"
 #define SUB_VERSION ""