Merge branch 'rel-305'

Conflicts: scripts/build/installer/install.nsi scripts/package_for_release.py
wrye-bash · Aug 23, 2014 · d8f0520 · d8f0520
2 parents df77b46 + 0a09249
commit d8f0520
Show file tree

Hide file tree

Showing 50 changed files with 34,443 additions and 22,208 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,7 +6,6 @@
 
 # M$ files
 *.bat text eol=crlf
-Mopy/bash/compiled/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest text eol=crlf
 
 # UNIX files
 **/generate_second_post text eol=lf

diff --git a/.project b/.project
diff --git a/.pydevproject b/.pydevproject