Danila Fedorin eb3410f854 Merge branch 'sin' ... # Conflicts: # src/main/java/org/nwapw/abacus/Abacus.java # src/main/java/org/nwapw/abacus/plugin/PluginManager.java		2017-08-04 12:04:37 -07:00
..
config	Add defaults that actually work.	2017-08-02 21:57:53 -07:00
function	Merge branch 'sin'	2017-08-04 12:04:37 -07:00
fx	Merge branch 'sin'	2017-08-04 12:04:37 -07:00
lexing	Format code.	2017-07-30 21:11:32 -07:00
number	Merge branch 'sin'	2017-08-04 12:04:37 -07:00
parsing	Fix order of operations bug.	2017-08-03 13:14:09 -07:00
plugin	Merge branch 'sin'	2017-08-04 12:04:37 -07:00
tree	Rename nodes to more general names.	2017-08-02 10:41:52 -07:00
window	Focus on the text field on startup.	2017-07-30 21:25:21 -07:00
Abacus.java	Merge branch 'sin'	2017-08-04 12:04:37 -07:00