Merge git://github.com/dkr/ananas-labs into dkr-validation
authorAndrey Paskal <apaskal@gmail.com>
Sat, 5 Jul 2008 08:05:57 +0000 (12:05 +0400)
committerAndrey Paskal <apaskal@gmail.com>
Sat, 5 Jul 2008 08:05:57 +0000 (12:05 +0400)
commitfafcffccbb57e3bf4080001fa2ce9b09feff9c96
treedc2ff0f50b5f0b1ab7ff99fbc5d4c935c2156050
parent9cee890305321a98d2ca125f253180366aa46114
parent0260e0467bc31a7a2d1d7faf81b31c5da6270f47
Merge git://github.com/dkr/ananas-labs into dkr-validation

Conflicts:

src/ananas/aminicalc.cpp
src/ananas/aminicalc.h
src/ananas/ananas.pro
src/ananas/ananasmainform.cpp
src/ananas/ananasmainform.h
src/extensions/minicalc/aminicalc.cpp
src/extensions/minicalc/aminicalc.h
src/lib/aminicalc.cpp
src/lib/aminicalc.h

Только разрезолвил конфликт объединения. Компилить не пробовал.
src/ananas/ananas.pro
src/ananas/ananasmainform.cpp
src/ananas/ananasmainform.h