Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --git a/.buildpath b/.buildpath
new file mode 100644 (file)
index 0000000..606f236
--- /dev/null
+++ b/.buildpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<buildpath>\r
+       <buildpathentry kind="src" path=""/>\r
+       <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>\r
+</buildpath>\r

diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..69b8b33
--- /dev/null
+++ b/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>tt-rss</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.wst.validation.validationbuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.dltk.core.scriptbuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.php.core.PHPNature</nature>\r
+               <nature>org.eclipse.wst.jsdt.core.jsNature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644 (file)
index 0000000..f5d6a6f
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" path="">\r
+               <attributes>\r
+                       <attribute name="provider" value="org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider"/>\r
+               </attributes>\r
+       </classpathentry>\r
+       <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>\r
+       <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">\r
+               <attributes>\r
+                       <attribute name="hide" value="true"/>\r
+               </attributes>\r
+       </classpathentry>\r
+       <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>\r
+       <classpathentry kind="output" path=""/>\r
+</classpath>\r

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..c7659c2
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Sat Dec 10 20:32:32 MSK 2011\r
+eclipse.preferences.version=1\r
+encoding/functions.php=UTF-8\r

diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
new file mode 100644 (file)
index 0000000..ffae6c3
--- /dev/null
+++ b/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,3 @@
+#Sat Dec 10 20:07:32 MSK 2011\r
+eclipse.preferences.version=1\r
+include_path=0;/tt-rss\r

diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644 (file)
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file

diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644 (file)
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file