Документ взят из кэша поисковой машины. Адрес оригинального документа : http://kodomo.fbb.msu.ru/hg/allpy/rev/e7760fc574b5
Дата изменения: Unknown
Дата индексирования: Tue Oct 2 00:57:11 2012
Кодировка:
allpy: e7760fc574b5

allpy

changeset 892:e7760fc574b5

Automated merge with ssh://kodomo/allpy
author Daniil Alexeyevsky <dendik@kodomo.fbb.msu.ru>
date Mon, 19 Sep 2011 20:52:53 +0400
parents 32808e442d93 c15e35bb3bca
children f07274838db8
files .hgignore
diffstat 2 files changed, 76 insertions(+), 56 deletions(-) [+]
line diff
     1.1 --- a/.hgeol	Sun Sep 18 16:32:59 2011 +0400
     1.2 +++ b/.hgeol	Mon Sep 19 20:52:53 2011 +0400
     1.3 @@ -9,7 +9,27 @@
     1.4  **.tcl = native
     1.5  **.C = native
     1.6  **.h = native
     1.7 +utils/** = native
     1.8  debian/** = native
     1.9  Makefile = native
    1.10 +**/Makefile = native
    1.11  README* = native
    1.12 +**/README* = native
    1.13 +TODO = native
    1.14 +**/TODO = native
    1.15  NEWS = native
    1.16 +**/NEWS = native
    1.17 +.hgignore = native
    1.18 +
    1.19 +**.png = BIN
    1.20 +
    1.21 +# XXX: all executable scripts without extensions must end up in utils/
    1.22 +# this exception must go away
    1.23 +geometrical_core/geometrical-core = native
    1.24 +
    1.25 +# XXX: these are all parts of Boris' build system for
    1.26 +# blocks3d-wt and must go away in favour of a Makefile
    1.27 +**.sh = native
    1.28 +**.xml = native
    1.29 +**.pro = native
    1.30 +**.ini = native
     2.1 --- a/.hgignore	Sun Sep 18 16:32:59 2011 +0400
     2.2 +++ b/.hgignore	Mon Sep 19 20:52:53 2011 +0400
     2.3 @@ -1,56 +1,56 @@
     2.4 -syntax: glob
     2.5 -
     2.6 -# Compiler-generated junk
     2.7 -*.pyc
     2.8 -build
     2.9 -output
    2.10 -*.o
    2.11 -blocks3d/wt/blocks3d-wt
    2.12 -debian/.dep
    2.13 -.coverage
    2.14 -
    2.15 -# Junk from text-editors
    2.16 -*.geany
    2.17 -*.swp
    2.18 -
    2.19 -# Hand-generated temporary files
    2.20 -temp
    2.21 -temp.*
    2.22 -
    2.23 -# Permananent and useful autogenerated stuff
    2.24 -allpy/data/codes.py
    2.25 -
    2.26 -# Temporary files from building
    2.27 -allpy/data/components.cif
    2.28 -blocks3d/www/input/conservative_groups.js
    2.29 -blocks3d/www/input/crc32.js
    2.30 -blocks3d/www/input/utf8_encode.js
    2.31 -blocks3d/www/input/dechex.js
    2.32 -blocks3d/www/input/json2.js
    2.33 -blocks3d/wt/files/js
    2.34 -blocks3d/wt/files/resources
    2.35 -blocks3d/html.htm
    2.36 -pair_cores/html.htm
    2.37 -*.zip
    2.38 -
    2.39 -# Temporary files from sphinx
    2.40 -docs/build
    2.41 -
    2.42 -# Temporary files from debianization
    2.43 -debian/python-allpy/
    2.44 -debian/blocks3d/
    2.45 -debian/blocks3d-wt/
    2.46 -debian/geometrical-core2/
    2.47 -
    2.48 -debian/bin/
    2.49 -debian/*.substvars
    2.50 -debian/*.debhelper*
    2.51 -debian/*stamp*
    2.52 -debian/files
    2.53 -debian/control
    2.54 -debian/*.log
    2.55 -debian/*/*.log
    2.56 -debian/tmp/
    2.57 -debian/pycompat
    2.58 -*.deb
    2.59 -*.cdbs-config_list
    2.60 +syntax: glob
    2.61 +
    2.62 +# Compiler-generated junk
    2.63 +*.pyc
    2.64 +build
    2.65 +output
    2.66 +*.o
    2.67 +blocks3d/wt/blocks3d-wt
    2.68 +debian/.dep
    2.69 +.coverage
    2.70 +
    2.71 +# Junk from text-editors
    2.72 +*.geany
    2.73 +*.swp
    2.74 +
    2.75 +# Hand-generated temporary files
    2.76 +temp
    2.77 +temp.*
    2.78 +
    2.79 +# Permananent and useful autogenerated stuff
    2.80 +allpy/data/codes.py
    2.81 +
    2.82 +# Temporary files from building
    2.83 +allpy/data/components.cif
    2.84 +blocks3d/www/input/conservative_groups.js
    2.85 +blocks3d/www/input/crc32.js
    2.86 +blocks3d/www/input/utf8_encode.js
    2.87 +blocks3d/www/input/dechex.js
    2.88 +blocks3d/www/input/json2.js
    2.89 +blocks3d/wt/files/js
    2.90 +blocks3d/wt/files/resources
    2.91 +blocks3d/html.htm
    2.92 +pair_cores/html.htm
    2.93 +*.zip
    2.94 +
    2.95 +# Temporary files from sphinx
    2.96 +docs/build
    2.97 +
    2.98 +# Temporary files from debianization
    2.99 +debian/python-allpy/
   2.100 +debian/blocks3d/
   2.101 +debian/blocks3d-wt/
   2.102 +debian/geometrical-core2/
   2.103 +
   2.104 +debian/bin/
   2.105 +debian/*.substvars
   2.106 +debian/*.debhelper*
   2.107 +debian/*stamp*
   2.108 +debian/files
   2.109 +debian/control
   2.110 +debian/*.log
   2.111 +debian/*/*.log
   2.112 +debian/tmp/
   2.113 +debian/pycompat
   2.114 +*.deb
   2.115 +*.cdbs-config_list