Di Mang
7439b27f96
Remove the emacs comments at the end of files
2018-03-14 23:04:00 +01:00
fell
273532c561
Merge branch 'maint' into unstable
...
PR #311
2018-03-14 08:53:01 +01:00
fell
6ee1c71d50
Merge branch 'maint' into unstable
...
PR #305 , #:306
2018-03-08 23:04:18 +01:00
fell
f8fd9dd272
Merge branch 'maint' into unstable
...
PR #303
2018-03-07 05:37:42 +01:00
John Ralls
2acb6da2b8
Bug 794083 - gnucash-2.7.5: cmake+make build installs Makefile
2018-03-06 10:13:06 -08:00
fell
d95eb0f7f3
Merge branch 'maint' into unstable
...
PR #300
2018-03-06 05:58:07 +01:00
Di Mang
335082480d
Revision and expansion of accounts for the Russian language.
...
In addition, replacing of commodity: USD => RUB.
2018-03-03 22:08:39 +01:00
John Ralls
a92180f03b
Remove superfluous variable.
2018-02-15 16:05:51 -08:00
John Ralls
d97b0f2617
No more Makefile.am.
2018-02-15 16:04:59 -08:00
fell
849b236f7b
Merge branch 'maint' into unstable
...
Conflicts:
accounts/Makefile.am
configure.ac
from autotools removed.
2018-02-13 07:46:52 +01:00
Geert Janssens
a3a42d29ee
Prevent installation of cmake related files when building in source
...
These files are part of the build system, they should not show up in the installation prefix
2018-02-04 10:36:42 +01:00
John Ralls
6ffb77de20
Merge branch Rob Gowin's 'bye_bye_autotools' into unstable.
2018-01-18 12:02:56 -08:00
Geert Janssens
2364c5607f
Merge branch 'maint' into unstable
...
Resolved conflicts:
gnucash/gnome-search/dialog-search.c
gnucash/gnome-utils/gnc-splash.c
gnucash/import-export/aqb/gnc-plugin-aqbanking.c
gnucash/import-export/import-account-matcher.c
po/de.po
src/report/standard-reports/budget-barchart.scm
src/report/standard-reports/budget.scm
Note the de.po conflict was resolved by dropping all changes
and merging the file again with gnucash.pot (generated after
the merge but before committing).
2018-01-17 18:08:05 +01:00
Rob Gowin
54ac7f23e0
Remove Autotools
2018-01-13 12:52:57 -06:00
John Ralls
9b0a8723a4
More GNUInstallDirs path fixes.
2017-12-01 13:56:52 -08:00
John Ralls
5204100d53
Use GNUInstallDirs in CMake Builds
...
Provides correct file layout when building distribution tarballs.
Fixes Bugs 790840 and 790841.
2017-11-28 14:25:35 -08:00
John Ralls
1895ae280c
Merge branch 'maint' into unstable
2017-11-09 13:45:45 -08:00
Geert Janssens
b3b4b20e4b
Merge branch 'maint' into unstable
...
Resolved conflicts:
CMakeLists.txt
NEWS
configure.ac
2017-09-27 17:35:13 +02:00
Geert Janssens
7448d8b532
Merge 'maint' into unstable
...
Resolved conflicts:
configure.ac
2017-09-21 14:26:20 +02:00
Geert Janssens
afecab330a
Move accounts, checks and pixmaps into a data directory
...
At the same time move the art directory into contrib to unclutter the top level
2017-08-11 22:42:15 +02:00