Merge pull request #82 from alexey-lysiuk/build_system_fixes

Build system fixes
trol73 · Jul 11, 2015 · 6e34d75 · 6e34d75
2 parents af0aecd + fb6594f
commit 6e34d75
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2,779 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,3 @@ out/*
 .svn/*
 /bin/
 .idea/workspace.xml
-.idea/misc.xml
-.idea/vcs.xml
-.idea/vcs.xml
diff --git a/.idea/libraries/jediterm.xml b/.idea/libraries/jediterm.xml
diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/mucommander.iml b/src/mucommander.iml
@@ -2,6 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
+    <content url="file://$MODULE_DIR$/../res/runtime">
+      <sourceFolder url="file://$MODULE_DIR$/../res/runtime" type="java-resource" />
+    </content>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/main" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />