Merge branch 'master' into Network_Upgrade

This commit is contained in:
betasteward 2015-05-28 21:06:32 -04:00
commit e7bb3a0dbf
324 changed files with 9827 additions and 1835 deletions

View file

@ -72,7 +72,7 @@
<filtered>false</filtered>
<directory>db/</directory>
<includes>
<include>*.db</include>
<include>cards.h2.mv.db</include>
</includes>
<outputDirectory>db/</outputDirectory>
<fileMode>0644</fileMode>