Created icons collapse and expand.

[toast/confclerk.git] / README

diff --git a/README b/README
index 3694ce4fcae8107bcb0017236484ab33596ba08c..c2d000af9627b070a449f77a94666cdf3d15c610 100644 (file)
--- a/README
+++ b/README
@@ -6,15 +6,15 @@ Description:
 
 ConfClerk is an application written in Qt, which makes conference
 schedules available offline.  It displays the conference schedule
 
 ConfClerk is an application written in Qt, which makes conference
 schedules available offline.  It displays the conference schedule

-from various views, support searches on various items (speaker, speech topic,
+from various views, supports searches on various items (speaker, speech topic,

 location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 At the moment ConfClerk is able to import schedules in XML format created by
 location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 At the moment ConfClerk is able to import schedules in XML format created by

-the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and
-the CCC.
+the PentaBarf conference management system (or frab) used by e.g. FOSDEM,
+DebConf, FrOSCon, Grazer Linuxtage, and the CCC.

 
 

-ConfClerk is targetted at mobile devices like the Nokia N810 and N900 but
+ConfClerk is targeted at mobile devices like the Nokia N810 and N900 but

 works on any sytem running Qt.
 
 See the file ./INSTALL for building and installation instructions, and
 works on any sytem running Qt.
 
 See the file ./INSTALL for building and installation instructions, and


@@ -24,7 +24,7 @@ See the file ./INSTALL for building and installation instructions, and
 Copyright and License:
 
   Copyright (C) 2010 Ixonos Plc.
 Copyright and License:
 
   Copyright (C) 2010 Ixonos Plc.

-  Copyright (C) 2011, Philipp Spitzer, gregor herrmann
+  Copyright (C) 2011-2012, Philipp Spitzer, gregor herrmann, Stefan Strahl

 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -58,8 +58,26 @@ data/confclerk.*:
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 

+src/icons/favourite-*, src/icons/alarm-*, src/icons/collapse*, src/icons/expand*:
+
+  Copyright (C) 2012, Philipp Spitzer, Stefan Strahl
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+

 src/icons/*:
 src/icons/*:

-All icons are taken from the Debian package gnome-icon-theme, which contains
+All other icons are taken from the Debian package gnome-icon-theme, which contains

 the following notice (as of 2011-06-24):
 
   Copyright © 2002-2008:
 the following notice (as of 2011-06-24):
 
   Copyright © 2002-2008:


@@ -81,7 +99,7 @@ the following notice (as of 2011-06-24):
 
 History:
 
 
 History:
 

-ConfClerk started as fosdem-schedule, targetted at Maemo as an operating
+ConfClerk started as fosdem-schedule, targeted at Maemo as an operating

 system and the FOSDEM conference.
 fosdem-schedule was written by Ixonos Plc., maintained at
 http://sourceforge.net/projects/fosdem-maemo/ , and released under the GNU GPL
 system and the FOSDEM conference.
 fosdem-schedule was written by Ixonos Plc., maintained at
 http://sourceforge.net/projects/fosdem-maemo/ , and released under the GNU GPL


@@ -102,3 +120,12 @@ Philipp Spitzer, gregor herrmann
 Toastfreeware
 <toast+confclerk@toastfreeware.priv.at>
 http://www.toastfreeware.priv.at/confclerk/
 Toastfreeware
 <toast+confclerk@toastfreeware.priv.at>
 http://www.toastfreeware.priv.at/confclerk/

+
+
+Tested pentabarf (or frab) instances:
+
+- FOSDEM (2012): http://fosdem.org/schedule/xml
+- Grazer Linuxtage (2012): http://glt12-programm.linuxtage.at/schedule.de.xml
+- DebConf (2011): http://penta.debconf.org/dc11_schedule/schedule.en.xml
+- 28C3: http://events.ccc.de/congress/2011/Fahrplan/schedule.en.xml
+- FrOSCon (2011): http://programm.froscon.org/2011/schedule.xml