diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-04 20:19:52 +0100 |
| commit | 383dc9895eac5f1b8ee2a938bfff4a1482228817 (patch) | |
| tree | a6af696a4ecd6259628f2885e23eadb637603b30 /conf | |
| parent | ecd445c000e4e54bf7228890848222312cffd3e3 (diff) | |
| parent | 2005b6b650f2523cb58a005961a55a6f099c70c3 (diff) | |
| download | rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.gz rpg-383dc9895eac5f1b8ee2a938bfff4a1482228817.tar.bz2 | |
Merge branch 'master' into future
* master: (45 commits)
TarLib code cleanup
TarLib: fixed appending in non-dynamic mode
fixed third method of adding files in TarLib
fix lone zero block in TarLib created archives
fix use of constructor in TarLib
Slovak language update
Korean language update
Latvian language update
removed redundant variables in tpl_include_page() (because of 3ff8773b)
added cut off points for mobile devices as parameters to style.ini
Corrected typo: ruke -> rule
Persian language update
Spanish language update
russian language update
Kazach language update
correctly check hash parameter in media dispatcher FS#2648
avoid broken browser_uid on IE
Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
Made striplangs.php executable
release preparations
...
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/acronyms.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/acronyms.conf b/conf/acronyms.conf index 058e85550..66f563bd2 100644 --- a/conf/acronyms.conf +++ b/conf/acronyms.conf @@ -90,8 +90,6 @@ OTOH On the other hand P2P Peer to Peer PDA Personal Digital Assistant PDF Portable Document Format -Perl Practical Extraction and Report Language -PERL Practical Extraction and Report Language PHP Hypertext Preprocessor PICS Platform for Internet Content Selection PIN Personal Identification Number |