X-Git-Url: http://gitweb/?a=blobdiff_plain;f=rejmerge.in;h=69cb95e33c1bf994356555bdf5b36eb57329750d;hb=e351466294c697439c83f7f90cb835cf5eeeaf22;hp=e95f4dfd7c7b53dba9550e6a1c6f9f2c19522ff6;hpb=9ac667e68d3e36eb99272eac57219002ee2318e6;p=pkgutils-cross.git diff --git a/rejmerge.in b/rejmerge.in index e95f4df..69cb95e 100755 --- a/rejmerge.in +++ b/rejmerge.in @@ -3,6 +3,7 @@ # rejmerge (pkgutils) # # Copyright (c) 2000-2005 Per Liden +# Copyright (c) 2006-2013 by CRUX team (http://crux.nu) # # 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