From: Maxious Date: Thu, 10 Jan 2013 02:09:34 +0000 Subject: Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/scannr X-Git-Url: http://maxious.lambdacomplex.org/git/?p=scannr.git&a=commitdiff&h=483fb5c8b02ff54ee3eff6e41081aaeec2b01e77 --- Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/scannr --- --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,19 @@ *.wav *.pyc /nbproject/private/ +/output.txt + +bin +gen +target +.settings +.classpath +.project +*.keystore +*.swp +*.orig +*.log +*.properties +seed.txt +map.txt + --- a/.gitmodules +++ b/.gitmodules @@ -3,5 +3,5 @@ url = git://github.com/uskr/pynma.git [submodule "js/flotr2"] path = js/flotr2 - url = git://github.com/HumbleSoftware/Flotr2.git + url = https://github.com/HumbleSoftware/Flotr2.git --- /dev/null +++ b/.idea/compiler.xml @@ -1,1 +1,24 @@ + + + + + + --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -1,1 +1,5 @@ - + + + + + --- /dev/null +++ b/.idea/dictionaries/Madoka.xml @@ -1,1 +1,10 @@ - + + + + tgid + timefrom + timeto + tzoffset + + + --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ jar:file:\C:\Program Files (x86)\JetBrains\PhpStorm 5.0.2\lib\webide.jar!\resources\html5-schema\html5.rnc - + --- a/.idea/scannr.iml +++ b/.idea/scannr.iml @@ -1,6 +1,11 @@ - + + + + + + --- /dev/null +++ b/.idea/sqldialects.xml @@ -1,1 +1,8 @@ + + + + + + + --- /dev/null +++ b/.idea/uiDesigner.xml @@ -1,1 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,19 +2,27 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + +