removed merge conflicts
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7558 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
<<<<<<< ChangeLog
|
||||
2005-01-24 Theodore Kilgore <kilgota@auburn.edu>
|
||||
|
||||
* library.c: Added Precision Mini Model HA513A, reported by Alexander Bostrom.
|
||||
@@ -11,14 +10,6 @@
|
||||
|
||||
|
||||
2005-01-14 Theodore Kilgore <kilgota@auburn.edu>
|
||||
=======
|
||||
2005-01-17 Theodore Kilgore <kilgota@auburn.edu>
|
||||
|
||||
* library.c: Argus DC-1610/20 do not currently work; commented out.
|
||||
|
||||
|
||||
2005-01-14 Theodore Kilgore <kilgota@auburn.edu>
|
||||
>>>>>>> 1.8
|
||||
|
||||
* library.c: Added Argus DC-1610 and DC-1620.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user