[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6566] merge 6542:6565 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6566] merge 6542:6565 from trunk |
Date: |
Wed, 10 Nov 2010 09:23:52 +0000 |
Revision: 6566
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6566
Author: sigurdne
Date: 2010-11-10 09:23:52 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
merge 6542:6565 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-1_0-branch/frontend/inc/hook_config.inc.php
branches/Version-1_0-branch/frontend/templates/base/config.tpl
branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-1_0-branch/preferences/inc/class.boadmin_acl.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.boresponsible.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
branches/Version-1_0-branch/property/inc/class.socategory.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
branches/Version-1_0-branch/property/inc/class.uicategory.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/js/yahoo/property.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/category.xsl
branches/Version-1_0-branch/rental/inc/class.menu.inc.php
branches/Version-1_0-branch/rental/inc/class.socomposite.inc.php
branches/Version-1_0-branch/rental/inc/class.sounit.inc.php
branches/Version-1_0-branch/rental/inc/class.uicomposite.inc.php
branches/Version-1_0-branch/rental/inc/class.uiproperty_location.inc.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
branches/Version-1_0-branch/rental/templates/base/unit_list_partial.php
Added Paths:
-----------
branches/Version-1_0-branch/frontend/help/NO/helpdesk.index.pdf
branches/Version-1_0-branch/property/js/yahoo/location.responsiblility_role.js
branches/Version-1_0-branch/rental/setup/DEV_NLSH/
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565
Copied: branches/Version-1_0-branch/frontend/help/NO/helpdesk.index.pdf (from
rev 6565, trunk/frontend/help/NO/helpdesk.index.pdf)
===================================================================
--- branches/Version-1_0-branch/frontend/help/NO/helpdesk.index.pdf
(rev 0)
+++ branches/Version-1_0-branch/frontend/help/NO/helpdesk.index.pdf
2010-11-10 09:23:52 UTC (rev 6566)
@@ -0,0 +1,3324 @@
+%PDF-1.4
+%\xE2\xE3\xCF\xD3
+21 0 obj <</Linearized 1/L 446422/O 23/E 37708/N 4/T 445955/H [ 736 225]>>
+endobj
+
+xref
+21 22
+0000000016 00000 n
+0000000961 00000 n
+0000001041 00000 n
+0000001176 00000 n
+0000001389 00000 n
+0000002098 00000 n
+0000002770 00000 n
+0000003128 00000 n
+0000003172 00000 n
+0000003414 00000 n
+0000003662 00000 n
+0000003738 00000 n
+0000005482 00000 n
+0000005873 00000 n
+0000005907 00000 n
+0000008576 00000 n
+0000017807 00000 n
+0000018659 00000 n
+0000023135 00000 n
+0000037256 00000 n
+0000037485 00000 n
+0000000736 00000 n
+trailer
+<</Size 43/Prev 445944/Root 22 0 R/Info 20 0
R/ID[<A907EBB362759685642D3A1E60981E38><0CD64456BFF59448AB4CE803475EC1F6>]>>
+startxref
+0
+%%EOF
+
+42 0 obj<</Length 139/Filter/FlateDecode/I 167/L 151/S 90>>stream
address@hidden<