The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 8f2c474234c20e23561bf181000ff495fe4f1597
Merge: b8dbaab a98f7ad
Author: Uwe Stöhr <[email protected]>
Date:   Mon Dec 31 18:35:02 2012 +0100

    Merge branch 'master' of git.lyx.org:lyx


commit b8dbaab9158fa13f24ae018241c95c8a9fd1c29c
Author: Uwe Stöhr <[email protected]>
Date:   Mon Dec 31 18:34:49 2012 +0100

    installer: a comment format fix

diff --git a/development/Win32/pdfview/pdfview.nsi 
b/development/Win32/pdfview/pdfview.nsi
index 36da7d5..aab892f 100644
--- a/development/Win32/pdfview/pdfview.nsi
+++ b/development/Win32/pdfview/pdfview.nsi
@@ -100,15 +100,15 @@ Var TimeDiff
 
 Function GetFileTimeS
        
-   Exch $0  ;; File / hi
-   Push $1  ;; lo
+   Exch $0  # File / hi
+   Push $1  # lo
  
    ClearErrors
    GetFileTime "$0" $0 $1
    IfErrors err
    System::Call '*(i r1, i r0) i .r0'
    System::Call '*$0(l .r0)'
-   System::Int64Op $0 / 10000000  ;; Conversion From '100 ns' to '1 sec' unit
+   System::Int64Op $0 / 10000000  # Conversion From '100 ns' to '1 sec' unit
    Goto end
  
    err:
@@ -135,9 +135,9 @@ FunctionEnd
 !macroend
 
 Function FileTimeDiff 
-   Exch $0  ;; FileA
+   Exch $0  # FileA
    Exch 
-   Exch $1  ;; FileB
+   Exch $1  # FileB
  
    ${GetFileTimeS} $0 "$0"
    IfErrors err

-----------------------------------------------------------------------

Summary of changes:
 development/Win32/pdfview/pdfview.nsi |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to