Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/revert-copyright-header-change into lp:ubuntu-clock-app.
Commit message: Reverted copyright header changes done in Stopwatch LapHistory Plugin borrowed from Michael Zanetti's stopwatch app. Requested reviews: Ubuntu Clock Developers (ubuntu-clock-dev) For more details, see: https://code.launchpad.net/~nik90/ubuntu-clock-app/revert-copyright-header-change/+merge/268891 Reverted copyright header changes done in Stopwatch LapHistory Plugin borrowed from Michael Zanetti's stopwatch app. -- Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/revert-copyright-header-change into lp:ubuntu-clock-app.
=== modified file 'app/upstreamcomponents/FastScroll.js' --- app/upstreamcomponents/FastScroll.js 2015-08-14 05:34:49 +0000 +++ app/upstreamcomponents/FastScroll.js 2015-08-24 09:57:45 +0000 @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** Copyright (C) 2014-2015 Canonical Ltda +** Copyright (C) 2014 Canonical Ltda ** All rights reserved. ** Contact: Nokia Corporation ([email protected]) ** === modified file 'app/upstreamcomponents/FastScroll.qml' --- app/upstreamcomponents/FastScroll.qml 2015-08-14 05:34:49 +0000 +++ app/upstreamcomponents/FastScroll.qml 2015-08-24 09:57:45 +0000 @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** Copyright (C) 2014-2015 Canonical Ltda +** Copyright (C) 2014 Canonical Ltda ** All rights reserved. ** Contact: Nokia Corporation ([email protected]) ** === modified file 'backend/modules/Stopwatch/LapHistory/history.cpp' --- backend/modules/Stopwatch/LapHistory/history.cpp 2015-08-20 19:59:21 +0000 +++ backend/modules/Stopwatch/LapHistory/history.cpp 2015-08-24 09:57:45 +0000 @@ -1,20 +1,22 @@ -/* - * Copyright (C) 2015 Canonical Ltd - * - * This file is part of Ubuntu Clock App - * - * Ubuntu Clock App is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Ubuntu Clock App 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, see <http://www.gnu.org/licenses/>. - */ +/***************************************************************************** + * Copyright: 2015 Michael Zanetti <[email protected]> * + * * + * This file is part of ubuntu-authenticator * + * * + * This prject 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 3 of the License, or * + * (at your option) any later version. * + * * + * This project 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, see <http://www.gnu.org/licenses/>. * + * * + ****************************************************************************/ #include "history.h" === modified file 'backend/modules/Stopwatch/LapHistory/history.h' --- backend/modules/Stopwatch/LapHistory/history.h 2015-08-20 19:59:21 +0000 +++ backend/modules/Stopwatch/LapHistory/history.h 2015-08-24 09:57:45 +0000 @@ -1,20 +1,22 @@ -/* - * Copyright (C) 2015 Canonical Ltd - * - * This file is part of Ubuntu Clock App - * - * Ubuntu Clock App is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * Ubuntu Clock App 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, see <http://www.gnu.org/licenses/>. - */ +/***************************************************************************** + * Copyright: 2015 Michael Zanetti <[email protected]> * + * * + * This file is part of ubuntu-authenticator * + * * + * This prject 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 3 of the License, or * + * (at your option) any later version. * + * * + * This project 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, see <http://www.gnu.org/licenses/>. * + * * + ****************************************************************************/ #ifndef HISTORY_H #define HISTORY_H
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
