Merge branch 'master' of git://github.com/drf/amsn2

LuHe · Nov 17, 2008 · bc3ab31 · bc3ab31
2 parents b78f00c + b8c28b8
commit bc3ab31
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 394 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ build/
 .cproject
 .pydevproject
 .ropeproject
+.svn/
 Debug/
 ui_*
diff --git a/amsn2/gui/front_ends/mine/.svn/all-wcprops b/amsn2/gui/front_ends/mine/.svn/all-wcprops
diff --git a/amsn2/gui/front_ends/mine/.svn/dir-prop-base b/amsn2/gui/front_ends/mine/.svn/dir-prop-base
diff --git a/amsn2/gui/front_ends/mine/.svn/entries b/amsn2/gui/front_ends/mine/.svn/entries
diff --git a/amsn2/gui/front_ends/mine/.svn/format b/amsn2/gui/front_ends/mine/.svn/format
diff --git a/amsn2/gui/front_ends/mine/.svn/text-base/__init__.py.svn-base b/amsn2/gui/front_ends/mine/.svn/text-base/__init__.py.svn-base
diff --git a/amsn2/gui/front_ends/mine/.svn/text-base/console.py.svn-base b/amsn2/gui/front_ends/mine/.svn/text-base/console.py.svn-base
diff --git a/amsn2/gui/front_ends/mine/.svn/text-base/contact_list.py.svn-base b/amsn2/gui/front_ends/mine/.svn/text-base/contact_list.py.svn-base
diff --git a/amsn2/gui/front_ends/mine/.svn/text-base/login.py.svn-base b/amsn2/gui/front_ends/mine/.svn/text-base/login.py.svn-base
diff --git a/amsn2/gui/front_ends/mine/.svn/text-base/main.py.svn-base b/amsn2/gui/front_ends/mine/.svn/text-base/main.py.svn-base