ninadsp c9253c0a0e Merge conflict resolved for Lori's tree merge to main		2010-08-22 12:42:54 +05:30
..
.htaccess	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
common.inc.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
config_info.inc.php	Merge conflict resolved for Lori's tree merge to main	2010-08-22 12:42:54 +05:30
ConfigFile.class.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
form_processing.lib.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
Form.class.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
FormDisplay.class.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
FormDisplay.tpl.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30
forms.inc.php	Merge conflict resolved for Lori's tree merge to main	2010-08-22 12:42:54 +05:30
index.lib.php	Resolve merge conflicts for upstream merge	2010-07-29 19:17:25 +05:30
messages.inc.php	Merge conflict resolved for Lori's tree merge to main	2010-08-22 12:42:54 +05:30
validate.lib.php	testing git setup - no major change made in code yet	2010-05-23 01:22:01 +05:30