Merge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterT... origin/StrikeWaterToolbox
-rw-r--r-- 77 .gitignore
-rw-r--r-- 4214 CHANGES.markdown
-rw-r--r-- 19250 CMakeLists.txt
-rw-r--r-- 35147 COPYING.GPLv3
-rw-r--r-- 483 COPYING.WTFPL
-rw-r--r-- 24675 COPYRIGHT
drwxr-xr-x - QtDesignerPlugins
-rw-r--r-- 4114 README.markdown
-rw-r--r-- 237 brewtarget.desktop.in
-rw-r--r-- 4648 brewtarget.qrc
-rw-r--r-- 148 brewtarget_cfg.qrc.in
drwxr-xr-x - cmake
-rwxr-xr-x 1590 configure
-rw-r--r-- 17451 create_db.sql
drwxr-xr-x - css
drwxr-xr-x - data
drwxr-xr-x - dev-doc
drwxr-xr-x - doc
-rwxr-xr-x 488 getdependencies
drwxr-xr-x - ideas
drwxr-xr-x - images
-rw-r--r-- 842007 initialize_db.sql
drwxr-xr-x - mac
drwxr-xr-x - migrations
drwxr-xr-x - project
drwxr-xr-x - src
drwxr-xr-x - translations
drwxr-xr-x - ui
drwxr-xr-x - win