# HG changeset patch # User ymh # Date 1339082328 -7200 # Node ID d4f46999d6bc8432bc604aaa5ed69474b93f8211 # Parent 249fe0bbc8174b56eb2418ea891916d144497245# Parent b5889be773eff94eb5b7c231abefd4e8d3d80f0e Merge with b5889be773eff94eb5b7c231abefd4e8d3d80f0e diff -r 249fe0bbc817 -r d4f46999d6bc .hgignore --- a/.hgignore Thu Jun 07 16:43:40 2012 +0200 +++ b/.hgignore Thu Jun 07 17:18:48 2012 +0200 @@ -10,4 +10,6 @@ ^web/index/.*$ ^web/log/.*$ ^web/static/.*$ -^script/record_mic/record_mic/bin$ \ No newline at end of file +^script/record_mic/record_mic/bin$ +syntax: regexp +^web/\.htaccess$ \ No newline at end of file diff -r 249fe0bbc817 -r d4f46999d6bc .pydevproject --- a/.pydevproject Thu Jun 07 16:43:40 2012 +0200 +++ b/.pydevproject Thu Jun 07 17:18:48 2012 +0200 @@ -2,6 +2,6 @@ -python_tralalere +Default python 2.7 diff -r 249fe0bbc817 -r d4f46999d6bc script/record_mic/record_mic_example.html --- a/script/record_mic/record_mic_example.html Thu Jun 07 16:43:40 2012 +0200 +++ b/script/record_mic/record_mic_example.html Thu Jun 07 17:18:48 2012 +0200 @@ -6,7 +6,7 @@