contrib
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
js
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
libraries
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
pmd
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
po
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
scripts
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
setup
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
test
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
themes
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
.gitignore
Ignore generated docs.
2010-05-13 11:34:52 +02:00
browse_foreigners.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
bs_disp_as_mime_type.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
bs_play_media.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
ChangeLog
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
changelog.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
chk_rel.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
config.sample.inc.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
CREDITS
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
db_create.php
Added documentation, fixed some minor bugs/typos
2010-08-13 23:34:10 +05:30
db_datadict.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_operations.php
Added documentation, fixed some minor bugs/typos
2010-08-13 23:34:10 +05:30
db_printview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_qbe.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_search.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_sql.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
db_structure.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
db_tracking.php
Added documentation, fixed some minor bugs/typos
2010-08-13 23:34:10 +05:30
docs.css
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
Documentation.html
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
enum_editor.php
Better to use format strings.
2010-08-19 11:26:34 +02:00
error.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
favicon.ico
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
import_status.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
import.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
index.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
INSTALL
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
LICENSE
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
license.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
main.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
navigation.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
pdf_pages.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pdf_schema.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
phpdoctor.ini
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
phpinfo.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
phpmyadmin.css.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
pmd_common.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_display_field.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_general.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
pmd_help.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
pmd_pdf.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_relation_new.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_relation_upd.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
pmd_save_pos.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
print.css
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
querywindow.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
README
Set version to 3.3.5.1.
2010-08-20 13:42:17 +02:00
README.VENDOR
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
robots.txt
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
server_binlog.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_collations.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_databases.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_engines.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_privileges.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
server_processlist.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_replication.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_sql.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_status.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_synchronize.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
server_variables.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
show_config_errors.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
sql.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_addfield.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_alter.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_change.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_create.php
Added documentation to PHP files
2010-08-15 01:50:47 +05:30
tbl_export.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_get_field.php
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
tbl_import.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_indexes.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_move_copy.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_operations.php
Resolved a Merge Conflict
2010-08-17 18:25:03 +05:30
tbl_printview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_relation.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_replace.php
Merge remote branch 'origin/master'
2010-08-03 18:25:19 +05:30
tbl_row_action.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_select.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
tbl_sql.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_structure.php
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
tbl_tracking.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
themes.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
TODO
testing git setup - no major change made in code yet
2010-05-23 01:22:01 +05:30
transformation_overview.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
transformation_wrapper.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
translators.html
Set version to 3.3.5.1.
2010-08-20 13:42:17 +02:00
user_password.php
Added documentation to PHP files
2010-08-15 01:50:47 +05:30
view_create.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
view_operations.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
webapp.php
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30