?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2877921 478169d)
Merge branch 'QA_3_4' into QA_3_5
commit68490d6ec434bef252b9a096bb84314ebcc11439
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sun, 29 Jan 2012 16:21:20 +0000 (29 21:51 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sun, 29 Jan 2012 16:21:20 +0000 (29 21:51 +0530)
tree7c7f74db465ea6a62d09dd31a2d7ddfe94ca8188tree | snapshot (tar.gz zip)
parent28779212196686f44650e362ec0fcfbb23140288commit | diff
parent478169d63ef333c0e7e2af4747eedc546135bf0acommit | diff
Merge branch 'QA_3_4' into QA_3_5

Conflicts:
libraries/tcpdf/README.TXT
libraries/tcpdf/encodings_maps.php
libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
libraries/tcpdf/fonts/dejavuserif.ctg.z
libraries/tcpdf/fonts/dejavuserif.php
libraries/tcpdf/fonts/dejavuserif.z
libraries/tcpdf/fonts/dejavuserifb.ctg.z
libraries/tcpdf/fonts/dejavuserifb.php
libraries/tcpdf/fonts/dejavuserifb.z
libraries/tcpdf/tcpdf.php
libraries/tcpdf/unicode_data.php
phpMyAdmin