Permalink
Browse files

resolve conflict

  • Loading branch information...
1 parent 32a10c9 commit c5846488a14600b3a65e7cde6bf787a6c4270822 @ismailsunni ismailsunni committed Nov 9, 2012
Showing 345 changed files with 13,510 additions and 9,913 deletions.
View
@@ -28,3 +28,7 @@ setup.cfg
run_qgis.sh
.achievements
.idea/runConfigurations/NoseTests_Realtime.xml
+.idea/workspace.xml
+pydev
+.idea/inasafe-dev.iml
+.idea/misc.xml
@@ -0,0 +1,9 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="timlinux">
+ <words>
+ <w>iface</w>
+ <w>pixmap</w>
+ <w>qgisapp</w>
+ </words>
+ </dictionary>
+</component>
View
@@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
- <orderEntry type="jdk" jdkName="Python 2.7.3 (/usr/bin/python2.7)" jdkType="Python SDK" />
+ <orderEntry type="jdk" jdkName="Python with QGIS-Master libs" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PackageRequirementsSettings">
@@ -0,0 +1,8 @@
+<component name="libraryTable">
+ <library name="sass-stdlib">
+ <CLASSES />
+ <SOURCES>
+ <root url="file://$APPLICATION_HOME_DIR$/plugins/sass/lib/stubs/sass_functions.scss" />
+ </SOURCES>
+ </library>
+</component>
View
@@ -7,6 +7,6 @@
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.3 (/usr/bin/python2.7)" project-jdk-type="Python SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python with QGIS-Master libs" project-jdk-type="Python SDK" />
</project>
@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="InaSAFE Docs" type="docs" factoryName="Sphinx task">
+ <configuration default="false" name="InaSAFE Docs" type="docs" factoryName="Sphinx task" editBeforeRun="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
@@ -9,7 +9,7 @@
<module name="inasafe-dev" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="docutils_input_file" value="docs/source" />
- <option name="docutils_output_file" value="docs/_build" />
+ <option name="docutils_output_file" value="docs/build" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="html" />
<option name="docutils_open_in_browser" value="false" />
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="NoseTest VectorTest" type="tests" factoryName="Nosetests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/safe/storage" />
- <option name="IS_MODULE_SDK" value="true" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/safe/storage/test_vector.py" />
- <option name="CLASS_NAME" value="VectorTest" />
- <option name="METHOD_NAME" value="testSublayerLoading" />
- <option name="FOLDER_NAME" value="" />
- <option name="TEST_TYPE" value="TEST_CLASS" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PyDebugRunner" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PyDebugRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="NoseTests SAFE_QGIS" type="tests" factoryName="Nosetests">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs>
- <env name="QGISPATH" value="/usr/local/qgis1.8" />
- </envs>
- <option name="SDK_HOME" value="/usr/bin/python2.7" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="SCRIPT_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="FOLDER_NAME" value="$PROJECT_DIR$/safe_qgis" />
- <option name="TEST_TYPE" value="TEST_FOLDER" />
- <option name="PATTERN" value="" />
- <option name="USE_PATTERN" value="false" />
- <option name="PARAMS" value="" />
- <option name="USE_PARAM" value="false" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="Sphinx HTML" type="docs" factoryName="Sphinx task">
- <option name="INTERPRETER_OPTIONS" value="" />
- <option name="PARENT_ENVS" value="true" />
- <envs />
- <option name="SDK_HOME" value="/usr/bin/python2.7" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/docs" />
- <option name="IS_MODULE_SDK" value="false" />
- <module name="inasafe-dev" />
- <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
- <option name="docutils_input_file" value="$PROJECT_DIR$/docs/source" />
- <option name="docutils_output_file" value="$PROJECT_DIR$/docs/build/html" />
- <option name="docutils_params" value="" />
- <option name="docutils_task" value="html" />
- <option name="docutils_open_in_browser" value="false" />
- <RunnerSettings RunnerId="PythonRunner" />
- <ConfigurationWrapper RunnerId="PythonRunner" />
- <method />
- </configuration>
-</component>
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="TestRunnerService">
- <option name="projectConfiguration" value="Nosetests" />
- <option name="PROJECT_CONFIGURATION" value="Nosetests" />
+ <option name="projectConfiguration" value="Unittests" />
+ <option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</project>
Oops, something went wrong.

0 comments on commit c584648

Please sign in to comment.