[gcalctool/gcalctool-newui2: 3/3] Merge commit 'origin/gcalctool-newui2' into gcalctool-newui2



commit ac2bf5c69482a5f84a59ba4873f75612f153085d
Merge: 7aa7fe9... f5d4e0e...
Author: Robert Ancell <robert ancell gmail com>
Date:   Thu Sep 17 12:44:06 2009 +1000

    Merge commit 'origin/gcalctool-newui2' into gcalctool-newui2
    
    Conflicts:
    	data/gcalctool.ui

 configure.in            |   57 +++++++++++++++++++++++---------------
 data/gcalctool.ui       |    1 +
 src/gtk.c               |   70 +++++-----------------------------------------
 src/mp-equation-lexer.l |   38 +++++++++++++-------------
 src/mp-trigonometric.c  |   10 +++---
 src/mp.c                |   33 +++++++++++-----------
 6 files changed, 83 insertions(+), 126 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]