Changeset 4589
- Timestamp:
- Aug 1, 2014, 7:12:10 PM (10 years ago)
- Location:
- pymolproxy/trunk
- Files:
-
- 1 added
- 1 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
pymolproxy/trunk/Makefile.in
r4364 r4589 71 71 72 72 distclean: clean 73 $(RM) Makefile pymol 73 $(RM) -f autom4te.cache 74 $(RM) Makefile config.cache config.log config.status pymol -
pymolproxy/trunk/aclocal.m4
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/1.3/packages/vizservers/aclocal.m4 4525 /branches/nanovis2/packages/vizservers/aclocal.m4 3001-3361
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
pymolproxy/trunk/cf
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/1.3/packages/vizservers/cf 4525 /branches/nanovis2/packages/vizservers/cf 3001-3361
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
pymolproxy/trunk/configure.in
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/1.3/packages/vizservers/configure.in 4525 /branches/nanovis2/packages/vizservers/configure.in 3001-3361
r4588 r4589 1 1 AC_PREREQ([2.60]) 2 AC_INIT([ vizservers], [0.1], [rappture@nanohub.org])2 AC_INIT([pymolproxy], [0.1], [rappture@nanohub.org]) 3 3 AC_CONFIG_AUX_DIR(cf) 4 AC_CONFIG_HEADERS([nanoscale/config.h])5 4 6 5 AC_ARG_WITH( … … 112 111 AC_CHECK_FUNCS([mkstemps]) 113 112 114 SUBDIRS="nanoscale pymolproxy"115 116 113 AC_SUBST(LD_RPATH) 117 114 AC_SUBST(LOGDIR) … … 124 121 125 122 AC_OUTPUT([ 126 Makefile \ 127 nanoscale/Makefile \ 128 nanoscale/renderservers.tcl \ 129 pymolproxy/Makefile \ 130 start_nanoscale.sh]) 123 Makefile]) -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.