Merge branch 'develop' of keyhammer.ath.cx:C2P into develop

Conflicts: C2P_Project/C2P_DB.dbmdl
2014-04-16 18:51:49 +02:00
parent 940c4cb81d d77801c989
commit fc596b244f
7 changed files with 91 additions and 22 deletions
@@ -204,6 +204,9 @@
    <Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdHead.sql" />
    <Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdCosts.sql" />
    <Build Include="dbo\Stored Procedures\dbo.stp_insNewLemma.sql" />
+    <Build Include="dbo\Tables\dbo.Permessi2Funzione.sql" />
+    <Build Include="dbo\Tables\dbo.Permessi.sql" />
+    <Build Include="dbo\Stored Procedures\dbo.stp_QLF_UpdQState.sql" />
  </ItemGroup>
  <ItemGroup>
    <None Include="C2P_compare_dev2prod.scmp" />