Try to make sure this matches the master branch. Merge CMakeLists into

main branch.

Author: JPeterMugaas

.gitignore

@@ -1,18 +1,18 @@
-/dist/rhash.spec
-/dist/rhash.1.*
-/dist/librhash.pc
-/librhash/exports.sym
-po/*.gmo
-/rhash
-/rhash_shared
-/rhash_static
-/librhash/test_shared
-/librhash/test_static
-config.mak
-*.[ao]
-*.exe
-*.dll
-*.def
-*.so
-*.so.0
-*.log
+/dist/rhash.spec
+/dist/rhash.1.*
+/dist/librhash.pc
+/librhash/exports.sym
+po/*.gmo
+/rhash
+/rhash_shared
+/rhash_static
+/librhash/test_shared
+/librhash/test_static
+config.mak
+*.[ao]
+*.exe
+*.dll
+*.def
+*.so
+*.so.0
+*.log

COPYING

@@ -1,15 +1,15 @@
-
-                                RHash License
-
-Copyright (c) 2005-2014 Aleksey Kravchenko <[email protected]>
-
-Permission is hereby granted, free of charge,  to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction,  including without limitation the rights
-to  use,  copy,  modify,  merge, publish, distribute, sublicense, and/or sell
-copies  of  the Software,  and  to permit  persons  to whom  the Software  is
-furnished to do so.
-
-The Software  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.  Use  this  program  at  your  own  risk!
+
+                                RHash License
+
+Copyright (c) 2005-2014 Aleksey Kravchenko <[email protected]>
+
+Permission is hereby granted, free of charge,  to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction,  including without limitation the rights
+to  use,  copy,  modify,  merge, publish, distribute, sublicense, and/or sell
+copies  of  the Software,  and  to permit  persons  to whom  the Software  is
+furnished to do so.
+
+The Software  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.  Use  this  program  at  your  own  risk!