Normalize line endings

This commit is contained in:
TfT_02 2013-03-08 21:42:26 +01:00
parent 0e2746622d
commit 3349e9cb05
2 changed files with 54 additions and 54 deletions

82
.gitignore vendored
View File

@ -1,42 +1,42 @@
# Eclipse stuff # Eclipse stuff
/.classpath /.classpath
/.project /.project
/.settings /.settings
# netbeans # netbeans
/nbproject /nbproject
# we use maven! # we use maven!
/build.xml /build.xml
# maven # maven
/target /target
# vim # vim
.*.sw[a-p] .*.sw[a-p]
# various other potential build files # various other potential build files
/build /build
/bin /bin
/dist /dist
/manifest.mf /manifest.mf
/world /world
# Mac filesystem dust # Mac filesystem dust
*.DS_Store *.DS_Store
# intellij # intellij
*.iml *.iml
*.ipr *.ipr
*.iws *.iws
.idea/ .idea/
# Project Stuff # Project Stuff
/src/main/resources/mcMMO /src/main/resources/mcMMO
# Other Libraries # Other Libraries
*.jar *.jar
# Atlassian Stuff # Atlassian Stuff
/atlassian-ide-plugin.xml /atlassian-ide-plugin.xml

View File

@ -1,14 +1,14 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id> <id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<files> <files>
<file> <file>
<source>${project.build.directory}/${artifactId}.jar</source> <source>${project.build.directory}/${artifactId}.jar</source>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<destName>mcMMO.jar</destName> <destName>mcMMO.jar</destName>
</file> </file>
</files> </files>
</assembly> </assembly>