Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c90459 authored by Mark Harman's avatar Mark Harman
Browse files

Update licences.

parent 0d6cd500

_docs/credits.html

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


<p>Open Camera is written by Mark Harman. Additional credits:</p>

<ul>

<li>App icon and take_photo.png, take_photo_pressed.png by Adam Lapinski.</li>

<li>App icon by Adam Lapinski.</li>

<li>Improvements/help for video frame rates (including high speed) by George Joseph.</li>

<li>Smart Housing Bluetooth LE support by Edouard Lafargue</li>

<li>Improved selfie stick button support by Lau Keat Hwa.</li>

_docs/index.html

+3 −1
Original line number Diff line number Diff line
@@ -276,13 +276,15 @@ Also see <i>"Can I use the Open Camera source code in my app?"</i> under the <a 
    ic_photo_size_select_large_white_48dp.png, ic_power_settings_new_white_48dp.png, ic_save_white_48dp.png,

    ic_slow_motion_video_white_48dp.png, ic_text_format_red_48dp.png, ic_text_format_white_48dp.png, ic_timelapse_white_48dp.png, ic_timer_white_48dp.png,

    ic_touch_app_white_48dp.png, ic_videocam_white_48dp.png, popup*.png, settings.png, share.png, switch_camera.png,

    take_photo.png (modified from ic_photo_camera_white_48dp), take_photo_pref.png (modified from ic_photo_camera_white_48dp), take_photo_pressed.png (modified from ic_photo_camera_white_48dp), take_photo_when_video_recording.png (modified from ic_photo_camera_white_48dp),

    take_video.png, take_video_pref.png, take_video_pressed.png, take_video_recording.png,

    trash.png,

    white_balance_locked.png (modified from baseline_lock_white_48),

    white_balance_unlocked.png (modified from baseline_lock_open_white_48),

    - from

    <a href="https://developer.android.com/design/downloads/index.html">https://developer.android.com/&#8203;design/downloads/index.html</a> / <a href="https://github.com/google/material-design-icons/">https://github.com/google/material-design-icons/</a> / <a href="https://design.google.com/icons/">https://design.google.com/icons/</a>,

    by Google, under <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache license version 2.0</a> (some cases include modifications, no need to credit me).</li>

    by Google, under <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache license version 2.0</a> (some cases include modifications, no need to credit me).

    Open Camera's app icon also makes use of ic_photo_camera_white_48dp by Google (also Apachce license version 2.0).</li>

    <li>beep.ogg, beep_hi.ogg - from <a href="http://opengameart.org/content/interface-beeps">http://opengameart.org/&#8203;content/interface-beeps</a> , by bart, under <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 (public domain)</a>.</li>

</ul>