merged RTI2 and distrrtgen_linux branch

diff --cc BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
index d45c6d122673c8ccedacb258a881f3794e5a819a,96f76e471c2a327e163657eac2fe37ea77cc872d..0fb305ca52bef56967b6f3a473b92d8aad2f75d6
--- 1/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
--- 2/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
+++ b/BOINC software/BOINC client apps/distrrtgen/distrrtgen.vcxproj
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">

diff --cc Common/rt api/des_enc.c
index 75c2de543b538270ecfa7fa72aedf517ebcb2af0,8364c746d775e2b941059003f15df63b879a0dd2..f2c99b7d64d086728dd5664180f4b12ac1616c31
--- 1/Common/rt api/des_enc.c
--- 2/Common/rt api/des_enc.c
+++ b/Common/rt api/des_enc.c
@@@ -60,11 -60,9 +60,11 @@@
   */
  
  #include "des_locl.h"
- #include "spr.h"
+ //#include "spr.h"
  
  extern        const DES_LONG des_SPtrans[8][64];
 +
 +
  void des_encrypt1(DES_LONG *data, des_key_schedule ks, int enc)
  {
        register DES_LONG l,r,t,u;