Shawn Pearce eadd369fda Merge branch 'stable-2.7' into stable-2.8 ... * stable-2.7: Bugfix: Changing Task state breaks comparator in ShowQueue Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java Change-Id: I7f5d5484c49a8dfb1e634ad57e28ba13ed3a607d		2013-12-07 09:47:58 -08:00
..
.settings	Suppress Eclipse warning "annotation should not be used as a superinterface"	2012-12-02 21:01:28 +09:00
src/main/java/com/google/gerrit/sshd	Merge branch 'stable-2.7' into stable-2.8	2013-12-07 09:47:58 -08:00
.gitignore	Add Intellij IDEA files to ignore list	2012-05-03 13:17:43 -07:00
BUCK	Remove jsr305 library	2013-09-26 23:12:55 -07:00