diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
| commit | 81e2244eca04c02de0d7c32f0063f64f2ca3b1c4 (patch) | |
| tree | 1014127ab7b69d121aa2fe4ed80de5a43e7b078a /.project | |
| parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
| parent | 3e7c42f81352ad73a1395ed0601f2d4fdf9b5359 (diff) | |
| download | askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.gz askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.bz2 askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/management/commands/send_email_alerts.py
locale/en/LC_MESSAGES/django.mo
settings.py
templates/about.html
templates/authopenid/complete.html
templates/authopenid/external_legacy_login_info.html
templates/content/js/com.cnprog.post.js
templates/content/js/com.cnprog.utils.js
templates/content/style/style.css
templates/question.html
templates/questions.html
Diffstat (limited to '.project')
| -rw-r--r-- | .project | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/.project b/.project new file mode 100644 index 00000000..8e56b007 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>osqa</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.python.pydev.PyDevBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.python.pydev.pythonNature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> |