From abb3a45a9aea580adced47edf4e87e5e9790fdf5 Mon Sep 17 00:00:00 2001 From: Alcaro Date: Tue, 18 Feb 2014 08:16:33 +0100 Subject: [PATCH] Fix alignment of this. --- rewind-alcaro.c | 16 ---------------- rewind.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/rewind-alcaro.c b/rewind-alcaro.c index eaef782106..576c9a4c8a 100644 --- a/rewind-alcaro.c +++ b/rewind-alcaro.c @@ -2,22 +2,6 @@ #include #include -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -#error Do not merge this anywhere. It is still unfinished, and could change quickly, possibly in ways that would be painful to keep up with. -A pull request will be submitted once the author is reasonably sure that there are no further things to optimize, and the style guide is upheld. -Due to a vacation, this pull request will be deferred until at least Monday; possibly another few days on top of that, depending on how much the RetroArch style guides differ from the preferences of the author. -It is, of course, fine to copy this somewhere to see whether the improvement is measurable. Just delete this block of text and copy the four rewind-* files. - //format per frame: //size nextstart; //repeat { diff --git a/rewind.c b/rewind.c index ae3bae30ae..856a6ad603 100644 --- a/rewind.c +++ b/rewind.c @@ -1,17 +1,17 @@ -/* RetroArch - A frontend for libretro. -* Copyright (C) 2010-2014 - Hans-Kristian Arntzen -* -* RetroArch 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 Found- -* ation, either version 3 of the License, or (at your option) any later version. -* -* RetroArch 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 RetroArch. -* If not, see . -*/ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * + * RetroArch 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 Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch 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 RetroArch. + * If not, see . + */ #include "rewind.h" #include "rewind-alcaro.h"