← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~wesleystout/openlp/documentation into lp:openlp

 

Wesley Stout has proposed merging lp:~wesleystout/openlp/documentation into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/57040

Added some files that got removed in the last merge for me that shouldn't have been removed. StevanP needs them to build the Windows help files.
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/57040
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.
=== added file 'documentation/manual/source/pics/001-first-time-language.png'
Binary files documentation/manual/source/pics/001-first-time-language.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/001-first-time-language.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/002-first-time-wizard-welcome.png'
Binary files documentation/manual/source/pics/002-first-time-wizard-welcome.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/002-first-time-wizard-welcome.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/003-first-time-wizard-plugins.png'
Binary files documentation/manual/source/pics/003-first-time-wizard-plugins.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/003-first-time-wizard-plugins.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/004-first-time-wizard-songs.png'
Binary files documentation/manual/source/pics/004-first-time-wizard-songs.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/004-first-time-wizard-songs.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/005-first-time-wizard-bibles.png'
Binary files documentation/manual/source/pics/005-first-time-wizard-bibles.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/005-first-time-wizard-bibles.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/006-first-time-wizard-themes.png'
Binary files documentation/manual/source/pics/006-first-time-wizard-themes.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/006-first-time-wizard-themes.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/007-first-time-wizard-settings.png'
Binary files documentation/manual/source/pics/007-first-time-wizard-settings.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/007-first-time-wizard-settings.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/009-first-time-wizard-progress.png'
Binary files documentation/manual/source/pics/009-first-time-wizard-progress.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/009-first-time-wizard-progress.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/010-first-time-wizard-finished.png'
Binary files documentation/manual/source/pics/010-first-time-wizard-finished.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/010-first-time-wizard-finished.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/011-first-time-wizard-song-import.png'
Binary files documentation/manual/source/pics/011-first-time-wizard-song-import.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/011-first-time-wizard-song-import.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/012-openlp-main-window.png'
Binary files documentation/manual/source/pics/012-openlp-main-window.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/012-openlp-main-window.png	2011-04-09 03:24:30 +0000 differ
=== added file 'documentation/manual/source/pics/alert.png'
Binary files documentation/manual/source/pics/alert.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/alert.png	2011-04-09 03:24:30 +0000 differ

Follow ups