summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJeremiah Benham <jjbenham@chicagoguitar.com>2008-06-06 23:55:30 -0500
committerJeremiah Benham <jjbenham@chicagoguitar.com>2008-06-06 23:55:30 -0500
commit7a601cc4bc6e813c5b2f0836d7bbcdcf3cb45e36 (patch)
tree9af89069338830ba690551f0f06d4e101a280123 /ChangeLog
parent2a54b7ca2525e099816052a8d333d6a044f86155 (diff)
removed frog* files and reference to them
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog14
1 files changed, 3 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index e14714cb..508499de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,9 @@
-<<<<<<< HEAD:ChangeLog
-2008-06-06 <jjbenha>
+2008-06-06 <jjbenham>
file.c, removed .jtf support
removed frogio.c/h frogdefs.h frogparser.h frogparser.y frogparser.c \
src/exportcsound.c src/Makefile.am, src/selectops.c removed reference to above files
src/exportcsound.c added function durationtofloat that used to be in
frogio.h
-
-=======
->>>>>>> master:ChangeLog
-
-<<<<<<< HEAD:ChangeLog
-=======
-2008-06-04 <rshann>
- print.c,h view.c, exportlilypond.c add support for printing excerpt from selection. Make function names more uniform.
->>>>>>> master:ChangeLog
2008-06-05 <jjbenham>
file.c added .png as supported export file type
exportlilypond.c added support for png export
@@ -24,6 +14,8 @@
view.c added to menu print excerpt
denemoui.xml added PrintExcerptPreview in menu
2008-06-04 <rshann>
+ print.c,h view.c, exportlilypond.c add support for printing excerpt from selection. Make function names more uniform.
+2008-06-04 <rshann>
examples Upbeat.denemo added.
2008-06-04 <rshann>
measureops.c showaccidental if note postfixed with ! or ?