labofsahil/github-event-dataset-2012 huggingface dataset:
more conflicts
JIRA-PHP375
merge conflict
Creating image alignment classes for blog content.
Merge commit 'cab.recent.r12' into integration

* commit 'cab.recent.r12':
  Creating image alignment classes for blog content.
  JIRA-PHP375
  Adding styles to post content's header tags.
  Minor update to share.
Fixing URLs and Titles in share partial.
JIRA-PHP230: 500 Error pages.
Merge commit 'widgetpress.em.r18' into integration

* commit 'widgetpress.em.r18':
  fixing comments
  comment on hcnage
  shit was all bustd in comments. this should fix it
  adding the required file for is_plugin_active to work
  removing debug line
  adding more specific term to the dropzone term for single right rails
  removing wrapper elements from single dropzone calls
  adding the ability to call dropzones based on section slug - implemented on single questions posts and guides
Merge commit 'cab.recent.r14' into integration

* commit 'cab.recent.r14':
  JIRA-PHP230: 500 Error pages.
  Fixing URLs and Titles in share partial.
Merge commit 'comm.20120926.r88' into jcomm
sitemap plugin hackiness
damn merge conflict
additions to the JS
Fix for category select on post a question for All QA - default to non-category select
Fix for form to JASON
more work on JSON cookie
finished form to json
removed block and edit screen name from user profile
Fix for things
fix for poll after login
Merge branch 'polls' of github.com:dasfisch/communities into polls
added eat cookie function
Merge branch 'polls' into cats-fuel-the-internet
another fix for cookies
more cookie shit
Merge branch 'polls' of https://github.com/dasfisch/communities into cats-fuel-the-internet
Merge branch 'polls' of https://github.com/dasfisch/communities into cats-fuel-the-internet
Merge branch 'polls' of https://github.com/dasfisch/communities into cats-fuel-the-internet
fix for issue with modal popping on refresh for attempt to poll vote then closing modal
implementing fe validation for category select
Merge branch 'polls' into questions
Added comments to comm_wp_dropdown_categories
moving the ribbon to wordpress menus
fixing comments
Merge branch 'widgetpress' into development
Move twitter link :/
Rollback versioning: adding delete version button for Curators.
Merge pull request #49 from datadryad/atmire-1289

Rollback versioning: adding delete version button for Curators.
Fix: Require a reason for versioning
Remove unused abstract_type monkeypatch
fix alength
ArrayChunk now uses array-reduce
CLJS-346: fix CLJ-319 regression for println when given no arguments.
Intermediate format specification, some layout/rendering design notes
fixed some javascripts
Updated Importer.java

Updated Importer.java for new indexes

Signed-off-by: David Fauth <dsfauth@gmail.com>
Merge remote-tracking branch 'origin/master'
Use pointers to rbtree nodes rather than indexes

Also had to update the algorithms to make use of the pointers. It's much
cleaner than using indexes into the memory.
demo figures; all tested
Minor tweaks for installer
yay new date picker
containsoneof and pdf only
tidied up ui slightly
coucou dans readme
Merge branch 'tandem1-dev' of https://github.com/ddeunagomez/javabien into tandem1-dev
Merge branch 'tandem1-dev' of https://github.com/ddeunagomez/javabien into tandem1-dev
Merge branch 'tandem1-dev' of https://github.com/ddeunagomez/javabien into tandem1-dev
Code du tandem1 come base
Notes tandem 1 jusqu'à 2.2 exclus
jusqua 2.2
Merge branch 'tandem1-dev' of https://github.com/ddeunagomez/javabien into tandem1-dev
Exceptions
Paartie 2.2 et début de la 2.3: Tout marche dans la 2.2, même le test qui teste si le cast marche (testMonter dans TestAutobus) mais je ne sais pas comment faire IllegalState... pour la 2.3
fin du 2.3 avec les mails de David
Partie 2.1
makefile instead of a shell script
Corrections apres le mail d David: maintenant monterDans() alnce bien une TecInvallid et toutes les choixPlaceMontee lancent une IllegalState
Partie 2.2
Merge branch 'master' into tandem1-dev
mise en static des variables de test. Correction du truc pour cather l'exception de cast
Réponse partielle des questions du 3.1
Partie 2 complete
Début de réponse pour le 3.2, j'ai pas bien compris ce qu'ils disent dans la doc de LinkedList. Je cite :
"This class is the opposite of the AbstractList class in the sense that it implements the "random access" methods (get(int index), set(int index, E element), add(int index, E element) and remove(int index)) on top of the list's list iterator, instead of the other way around."
Donc si vous comprenez mieux je suis pas contre une réponse.
comments
added history to REPL
Add link to professor overview from page page

There is no better way of saying it

Also fixed some other bugs, etc
added /usr/local/sbin to $PATH
restrict magic space in bash
noremap => map in .pentadactylrc
resolve conflict
Vommit 2: The Revenge of Flaming Vommit from Hell

now 20% more gitignore
Fixed uninitialized variable with alt parsing.
Working on WatchManager.
Work in progress.
combine is now functionally identical to the original version, refactoring is complete for combine. small tweaks to make the code more readible.
fix internal hardsub subtitile format
Merge branch 'hotfix/subtitleHurdsubFormat'
Fix Set parameters for AC2002
Converted readme to spaces instead of tabs
Added an example of Trailblazer usage

Also updated some documentation on the base node.  Specifically, I
changed the return type of the findInRange method.
Implementing login functionality and dynamic menus.
call virtualbox.sh instead of vagrant.sh
Add a new signal after all plugins loaded. Add a new property within Plugin interface.
added initial project
added app and conf
added initial project .gitignore
Fixed broken links in home and footer styles, yeah
Arrumando a casa ...
Fix again alsa dependency
Update pear package.xml
Added new profile layout, password recovery and password change prompts.
Added address selectivity
Update to v029680 codebase; zet.cpp, zet.h and z80 core are from v029708
More ignore files
Replacing silly toggle for open at startup
Adding fuel packages
Really clean all-logs.tar.bz2
Add jq alias for compatibility
DATAPRJ-34: Comment system | Add test
Re-adding ability to pass in array of targets into acl allowed function
Handle double quotes in csv. 
Merge pull request #14 from domoritz/master

Improved date parsing and simpler csv parsing
Add support for reading ZIP files and file format detection by MIME type, file extension, or magic numbers.
In type guessing, dates should have the lowest weight, not the highest, in order to prefer interpreting values as more basic data types when possible. I'm seeing single digits being parsed as dates rather than integers.
handle BOMs in UTF-16/32 streams in the CSV reader
add a utility function headers_make_unique to make sure we are passing unique names
in the new AnyTable, dont treat text/plain as necessarily CSV but instead fall back to the file extension if provided as a hint as to whether it is CSV or TSV; also some code cleanup
Merge pull request #15 from domoritz/master

Use locale parsing and tests
Merge pull request #17 from tauberer/master

Patches from HealthData.gov
Merge
Add dependency for python-magic, introduced by #17
added travis-ci config
added travis build status to readme
fixed restructured travis link
markdown readme
pep8 
Give date a higher guessing weight than string 
Merge branch 'master' of github.com:okfn/messytables
added my contact address to readme
Merge branch 'master' of github.com:okfn/messytables
Add Unit movement through civilization
Made some testing changes on exercises
Preparing for PHP refactor
Starting the refactor to PHP
Forgot the library directory
Cleaning up autosave files
Semi-stable, with new media file posting capability
More files for media file posting
Topics and files are presented inline
first half of session-based user (not using google stuff)
completing transition to own authentication
test branch commit
Merge branch 'test-branch'
Fixed Simpletest test method name.
initial commit.  Added a tool to display an arbitrary numpy array.  MapDisplay.pyw builds a numpy array, and feeds it to a MapFrame which has all the tkinter code to manipulate the array in the leftclick method
moved files into a src dir
Merge branch 'master' of github.com:duschmidt/cs313Birds
allow to get all session variables, not just start with "variable_"
allow us to subscribe any events
allow to add event filter.
allow inbound to subscribe to some channel
disable inbound to listen on all events by default.
allow to use api and bgapi at the same time.
fix path issue to allow test running in 1.9 environment.
copy files in install target + add release target

fixes #159

use the built products from third bootstrap
use these as well for release target
Merge pull request #216 from hannesm/make-install

don't rebuild in install target
Made c-r-t threads use pthreads synchronization

Before this, synchronizations where an emulated mess.

Known bugs:
 - Semaphore max values cannot be enforced with pthreads.
   I think this is acceptable. The documentation says
   that an exception MAY be thrown, so we don't.
c-r-t: Fix owned? for <recursive-mutex>

This was buggy in that it did not consider the mutex owned? any more
after releasing just once. To do this correctly we have to maintain
an explicit count, which I have implemented using atomics to avoid
various race conditions.
Emulate pthread_mutex_timedlock when not supported

Such as on Mac OS X.

We use a slow (100usec) trylock loop.
Clean up time handling in posix synchronizations

This code uses clock_gettime when available, falling back to
gettimeofday.

It also refactors timespec addition to a function.
Clean up POSIX compatibility defines

Moved checks to header. Made checks independent from uses.
Emulate POSIX semaphores when not available

This is mostly for OS X but might also be useful on Android.
Reintroduced some platform features in c-r-t posix-threads

We need these to get platform-specific functions.
Merge pull request #356 from promovicz/crt-synchronization

Made c-r-t threads use pthreads synchronization
card-restore: Add the ability to save and restore the maximum volume

module-card-restore now saves the maximum volume.

This change includes a entry version bump.
Week2 use
typos + other improvements
Merge pull request #2 from Erkan-Yilmaz/master

typos + other small issues
fix custom.less call and add in admin menu reposition for bootstrap
* Added support to mirror slackbuilds.org in slack-mirror
Rewind fix
problems four five six
fixed minor bugs: album list order, menu highlights, large image isnt so large
acer-wmi: No wifi rfkill on Lenovo machines

commit 461e74377cfcfc2c0d6bbdfa8fc5fbc21b052c2a upstream.

We have several reports which says acer-wmi is loaded on ideapads
and register rfkill for wifi which can not be unblocked.

Since ideapad-laptop also register rfkill for wifi and it works
reliably, it will be fine acer-wmi is not going to register rfkill
for wifi once VPC2004 is found.

Also put IBM0068/LEN0068 in the list. Though thinkpad_acpi has no
wifi rfkill capability, there are reports which says acer-wmi also
block wireless on Thinkpad E520/E420.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
working on cksums
scaffold de components
seperated custom adapter
upgrade to bootstrap 2
Ross Boylan:

I wish that ?foo, where foo is a non-existent
command, didn't leave a *help[R](foo)* buffer lying around.
ACTUALLY, IT HAS ALREADY BEEN IMPLEMENTED: JUST CUSTOMISE
ess-help-kill-bogus-buffers TO t (thanks to Sam Steingold)
t IS NOW THE DEFAULT IN ESS 12.03 (Rodney)

VERSION # updated in the above comment


git-svn-id: https://svn.r-project.org/ESS/trunk@4761 0bbaf3bd-34e0-0310-bf65-c717079852d4
Modified Copyright years and added myself to the list of authors.

git-svn-id: https://svn.r-project.org/ESS/trunk@4740 0bbaf3bd-34e0-0310-bf65-c717079852d4
With logme
with logme
With logbook
Wit hlogbookme ok
sum67() with a sample solution
Merge remote-tracking branch 'upstream/master' into main
update db dump
Merge branch 'master' of github.com:enwikipedia-acc/waca
Results storage
Replaced the old unreliable way in which cached summoners are updated
remove relic
fix reversed master/slave in/out
corrigindo mailer
Added a statistics per player and tournament query and view
new record page init and can fixed
DOC-1760 Add the document on how to demonstrate how to activate the OrgIntegService
vars for wp
Site updated at 2012-08-05 08:21:40 UTC
Site updated at 2012-12-15 11:13:09 UTC
Site updated at 2012-12-17 14:56:01 UTC
Site updated at 2012-09-26 22:27:17 UTC
Site updated at 2012-08-05 08:18:43 UTC
changes from automatic review
Merge pull request #6 from JMSBot/review-7095704c

Changes from Automatic Review
optional default prompt value, issue #24
Merge pull request #50 from fabien-d/defaultPromptMessage

Optional default prompt value
Handle "hg pull" return code change between 2.1 and 2.1.1 more gracefully

Summary:
See <https://github.com/facebook/phabricator/issues/102>. Between Feb 1 and Mar 1, the hg released changed the exit code behavior of "hg pull". This broke us mildly (and a bunch of other applications more severely, which is why it was reverted).

Detect the common case of this (english) and don't fail.

Test Plan: @killermonk, can you try applying this? I'll try to do an upgrade to 2.1 and see if I can also do a proper test.

Reviewers: Makinde, btrahan, killermonk

Reviewed By: btrahan

CC: killermonk, aran, epriestley

Differential Revision: https://secure.phabricator.com/D1948
m1 update to Diling City
Fix typos in jsunit
Merge branch 'master' of https://github.com/ariatemplates/ariatemplates
CSS macro libraries
Refactored class loaders
CSS macro libraries: Code review fixes
Merge pull request #123 from jakub-g/csslibs

CSS macro libraries
Changed the default message for the MinMaxLength validator.  This resolves #126
Fixes #122: inconsistent return type for getStyle()/opacity
Update packaging
Added CmlClassLoader to at-bootstrap.yaml
Confusing use of !

Remove some of the confusing use of '!' listed in #23
Some of them are not confusing and should be probaly kept
Expected something and saw something else

This fixes #30
FormatFactory is now deprecated as it's not needed anymore
Unescaped symbol

Fixes #31
Literal in parens

Fixes #32
Unexpected escape

Fixes #34
Fixes #128: Buttons's disabled property in simpleHTML issue
Merge pull request #130 from piuccio/jshint

Fix some of the Jshint errors
Fix for issue #129
Fix for #10 : remove the css width and height from the markup, to let the popup to be sized by its content.
added in form plugins
fixed bug where async method chaining doesn't work
list comprehensions
removed failing list parser test
Estable & going for resque

Signed-off-by: Fernando Tapia Rico <fertapric@gmail.com>
added Chicago
other fixes (pant)
some cleanup of changeset css. once again, revisions are on the same level as history in issues/show
Merge pull request #49 from finnlabs/chiliproject

CSS fixes to show revision at the same level as history
switch from chosen to select2

Conflicts:

	app/helpers/application_helper.rb
	app/views/layouts/base.rhtml
	public/stylesheets/project_select_select2.css
working project selection with updated select2

Conflicts:

	public/stylesheets/chosen.css
traps mouseevents inside top level menu items
update select2 css to current master 222fa7e4
one more open/closed event trigger for the top level menus on 'enter'
simulate tabbing away from select2 project search
remove fixed height for select2 boxes
simulate tabbing to select2 input field inside projectsearch
prevent ESC from closing project search menu
move select2 customizing stuff to select2_customizing.css
bump select2 version to current master; fixes tabbing issues
update select2 version and cleanup
removes leftover chosen.js

Conflicts:

	public/javascripts/chosen.js
Cleanup select2 adaption stylesheet

Removing unused rules, updating colors to latest theme, changing look to better
match previous project list
Cleaning up top_menu_helper

Removing unused parameters, simplifying code
Updating select2 to latest master 7f83d827

Note: Paths in CSS were changed.

Hoping to benefit from performance improvements on FF
Works in IE8
GPL v2 compatible
Cleanup select2 initialization

Removing code, which seems to have no significant side effect
Making hack to prepend an event listener less hacky
Adding comments, where I was able to decypher the original intention
Changing callback API to pass element as this

Cause friends don't let friends have window === this
Test file for issue 6074
Merge branch 'master' of github.com:firebug/manual-tests
adding trove classifiers
missed a comma
good for now
Added a test for TypedArrays, because the DataView test will fail for browsers that support TypedArrays/ArrayBuffers/and views of those buffers if they do not have DataView
Added single quoted strings
REjigger sizings.
Task 00 : JavaScript Review (recursive)
Test the bindings generator

 * Uses Android system headers
 * Includes a sample userconf.ini. Needed for the generator.
 * update gitignore to ignore test/user.cfg and test/userconf.ini
更新罗素悖论，挖一些坑
Added simple Saving message button.
Item11267: partial revert of version string change

version 0.77 required for "modern perl version strings" was released in
2009, and older installations might not meet that requirement.  Rather
than force another dependency, use simple quoted strings for versions.

our Dependency.pm module should be able to cope, and this is forward
compatible to the version strings.

git-svn-id: http://svn.foswiki.org/trunk/BuildContrib@16008 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
london patch
ignore bad bounding box lines
Update README to use proper snippets bundle

Updated to honza bundle instead of the out of date default bundle 
Merge pull request #100 from JamesMcMahon/patch-1

Update README to use proper snippets bundle (thanks)
Merge remote-tracking branch 'upstream/master'
MINOR AppController now has information about the cart and left columns default
ENHANCEMENT Many enhancements to the front end
ENHANCEMENT The product object is loaded with extra fields including formatted properties
ENHANCEMENT Added many other improvements to the front end
changed to util date in event
Merge branch 'master' of github.com:fpg44/fellesprosjekt
hhehe
Merge branch 'master' of github.com:fpg44/fellesprosjekt
Styled the detail page and comments

After styling -A- comment section, I went to root and then opened up
details again and the stylings aren't applied. Dupe comment listing
somewhere.
making merge commits with cory
remove unused submodules
clean README
Switch unit management in UCOM to unrhdr.

Extend the callback table of UCOM to include a
"ucom_free" function pointer which is called when
all refs on a UCOM super structure is gone.

Implement various helper functions to handle
refcounting and draining on the UCOM super
structure.

Implement macro which can be used in device
drivers to avoid module unload before all
pending TTY references are gone.

The UCOM API is backwards compatible after this
change and device drivers require no changes
to function with this change. Only a recompilation
of UCOM device drivers is required. The FreeBSD
version has been bumped in that regard.

Discussed with:	kib, ed
MFC after:	2 weeks


git-svn-id: svn+ssh://svn.freebsd.org/base/head@239179 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
This header file no longer exists when doing cross builds, so remove it.

mips24k hwpmc now compiles again.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@232869 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Convert ath(4) to just use ieee80211_suspend_all() and ieee80211_resume_all().

The existing code tries to use the beacon miss timer to signal that the AP
has gone away.  Unfortunately this doesn't seem to be behaving itself.
I'll try to investigate why this is for the sake of completeness.

The result is the STA will stay "associated" to the AP it was associated
with when it suspended.  It never receives a bmiss notification so it
never tries reassociating.

PR:		kern/169084


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237108 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Allow device_busy() and device_unbusy() to be invoked while a device is
being attached.  This is implemented by adding a new DS_ATTACHING state
while a device's DEVICE_ATTACH() method is being invoked.  A driver is
required to not fail an attach of a busy device.  The device's state will
be promoted to DS_BUSY rather than DS_ACTIVE() if the device was marked
busy during DEVICE_ATTACH().

Reviewed by:	kib
MFC after:	1 week


git-svn-id: svn+ssh://svn.freebsd.org/base/head@234152 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Trim stray blank line.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@234153 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix missing straggler for the move to parse_boot_param()


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237089 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix two instances of the file names generated by revnetgroup(8).

Approved by:	joel (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/base/head@239364 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
replace __unused with a portable construct;
fix a couple of signed/unsigned warnings.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@238988 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
- Add myself to calendar.freebsd
- Add my mentor relationships to committers-ports.dot

Approved by:	makc (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240362 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix small documentation mistakes.

Submitted by:	brueffer
Approved by:	kib (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/base/head@234773 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
- Disable threaded sort by default
- Fix typo in the NLS support


git-svn-id: svn+ssh://svn.freebsd.org/base/head@237628 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix for register_shutdown_function issue on certain PHP versions
[OPENENGSB-3026] Change messagestructure
[OPENENGSB-3025] Rename Namespaces
Lennox!
Merge branch 'master' of github.com:froots/scottish-play
Audience styling
Merge branch 'master' of github.com:froots/scottish-play
Style vote buttons
Removing reroute_email per #33279151
fix for installment bug
Changes the order and made middle param optional
This must work, maybe its just the github system which has some delay...
added print of total time to test
little bug on route names
.gitkeep
Merge branch 'master' of github.com:gabrielhora/theodore
removing invalid tmux configuration
libganglia: make gm_file C++ safe

avoid C++ name mangling in modules that import gm_files.h so
the linker will be able to find the righ public interface
Fix reverse from format
Started fixing preparsing
fixed exome-parsing
Added comments and fixed typo, removed unused object
fix drug_presenter url generation
added postfix evaluatione, testing
0.3.1
Merge branch 'master' of github.com:getsentry/raven-ruby
Vistas ahora tienen tamaño fijo...no dependiendo del tamaño de la pantalla
First attempt to use USART with ATMega328.
Create an echo application with USART.
Fix F_CPU.
Make blink the led on pin 13 of a standard Arduino.
Add Makefile that not uses Arduino build system.
Ignore hex and object files.
TinyMCE: Use the correct syntax for allowing an `embed` element to be a valid child of an `object` element.

Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
see #22790.
for trunk.
Compress scripts/styles: 3.5-RC5-23143. TinyMCE updated.
TinyMCE: Use the correct syntax for allowing an `embed` element to be a valid child of an `object` element.

Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
see #22790.
for trunk.
... with the right patch this time. [23142] was done in error.
Compress scripts/styles: 3.5-RC5-23145. TinyMCE updated.
HTTP: Don't force cookie values to be urlencoded because it breaks usage of cookies in some scenarios like the LiveJournal Importer. Instead add a filter for a plugin to use if it really wants to have the cookie mangled. Fixes #19922 props pw201, dllh and kurtpayne. 
Fix typo in [20372] - See #19922 props SergeyBiryukov.
Force the user to explicitly choose between content deletion and reassignment when deleting users. props Dan Rivera, Ben Brooks, GhostToast. fixes #20045.
added +startWithScheduler:subjectBlock:
fixing bug in USBcheckForDevice that was causing crashes.  forgot to initialize i
we only want a monitoring interface
Fallback phone
added different types of sorting
Mapa en Pedidos, Campo dirección en entity pedido. Creacion de Entity Opiniones (pruebas)
imagen herramientas del mapa
App kernel, Bundle para fixtures
composer bundle para fixtures
Merge pull request #9 from fabilocky/master

Mapa, foro y otras coasitas
Ember sucks!
Ember sucks!
Joosy
add weibo link to index
add links of slides and a news about this
added session video links
Fix csrf warning for payments#ipn.
modified quarterly_to_annually_h method
ENH: use pinv
Pause and options menu
Make gmqcc binary smaller (by removing some useless code)
print the number of performed optimizations after compiling
don't use vec_size but _vec_end in _vec_remove, since using it on an empty vector is an error anyway; this causes a warning about vec_pop doing an effect-less memmove so vec_pop now doesn't use vec_remove anymore actually
testing new macbook setup with git
Add OpenBSD -current file src/sys/dev/pci/vga_pci_common.c.
Messing around with JavaNIO Channels and Locks.

Trying to use JavaNIO in the JavaPOS keyboard driver.
dale0621
aligning place and date icons
adding more fields for meetings in  admin interface
adding translation for venue model
Adding more info to meeting show page
adding google map to show an address
changing meetins listing description
Little cleanup before publishing.
add .nojekyll
python-evdev development documentation
python-evdev development documentation
Removed Spring 3.0-compatibility (SOCIAL-286) and added support for client authentication via HTTP Basic, per the latest OAuth2 drafts (SOCIAL-320).
Added Resource Owner Credentials Grant support in OAuth2Template (SOCIAL-305) and polish on OAuth2Operations interface.
Removed file that shouldn't be tracked
Merge remote-tracking branch 'origin/master'
cst ok
Removed test data and created initialization checks for app so that it
doesn't crash the first time it is launched. Still need code in back end
to create the user for the first time as well as his/her first schedule.
Integrated create and delete schedules. There are still problems with
rename (does nothing) and diff which needs to not error out when a
non-existent user id is given. Set active function also needs to be
tested but cannot be done unless the first active schedule can be
created in login.
add dragon1.txt
c语言学习记录
delete the temporary file
修改设计模式的例子，增加设计模式用到的NANT文件，增加CSHARP的若干例子，增加排序算法的代码和其MAKEFILE文件
增加递归求解树形结构的例子
重命名19oracle.cs
增加java示例
修改jquery文件夹名称为小写
修改jquery文件夹名称为小写
增加javascript和html基本知识的示例
增加javascript有关示例
增加php示例,增加csharp自动获取model的示例
修改php示例，实现登录功能
add a example about wxpython
增加sqlite3数据库文件和其SQL脚本,修改yourall.py程序，实现登录和发布博客功能
修改php代码,增加linux_remark中关于装机必备
修改php代码,增加linux_remark中关于装机必备
用C语言模拟C#中List
算法有关的示例
js操作form，js验证的decorator部分实现
merge the javascript example and format all the html file with the netbean
gitignore
upgrade to 1.6.4.1
convince vim to try for 256 colors anyway
Устанавливает главную планету игрока активной при логине
Xcode could not find the TK files, also adding .DS_Store to gitignore
Merge pull request #4 from kgn/master

Xcode couldn't find the TK files
CFile: transparantly wrap FILE pointer

using operators instead of (named) member functions
allows for transparant FILE* --> CFile replacement
cosmetics
Fix DVB subtitles no longer working

Broken by ae0e0d5888eb8b83628a582030b4b87df5b9ac21
(side effect slipped through)
esection: get rid of global function

obsolete, there is a class member with the same name
esection: fix compiler warning
cosmetics: whitespace fixes
Use CFile wrapper in more places

Less code, less chance of leaks.
ChannelSelection: History zap to the previous service after e.g. timerzap

And not zap two services back. This by checking if the service in the
History equals to the service currently playing. When they are not equal
then zap to the latest service in the history, otherwise zap to the
previous service in the history
ChannelSelection.py: Do the same for recallPrevService

As I did for historyBack in my previous commit
openvix: build 401
Allow gstreamer to convert the audio when the dvbaudiosink doesn't support the format
[lcd_displays] tweak lcd skin coding.
[lcd_displays] more lcd skin tweaks, vu ultimo skin is now called 'skin_display255_no_picon.xml' or 'skin_display255_picon.xml', so sure you rename your custom skins you have in /etc/engima2 if you use them.
openvix: build 402
[lcd skin] fix skin name
[lcd skin] fix skin name
openvix: build 403
ChannelSelection: Add current played service not in history to history
openvix: build 404
servicedvb: fix compiler warning
Fixed small errors
Merge branch 'master' of https://github.com/hettan/FriendTracker
Merge branch 'master' of https://github.com/hettan/FriendTracker
Reading booleans

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>
Добавил отрисовку картинки.
update package.sh to same level as jdk8 or lambda
batch rpm signer
add ArrayList class Test
slight edit to WelcomePage.js
rokade bug
Handle running builds.
OpenPGP: support key generation in driver.
OpenPGP: Correct adding read access to ACL.
OpenPGP: Change the criteria to use ext APDU for put data.
OpenPGP: saner whitespace in logs

Correct spelling
OpenPGP PKCS#15: Add declaration of certificate object. Allow to read
certificate via PKCS#11 (not writing yet).
Add pkcs15init-binding for OpenPGP
openpgp.profile: fix pin references
OpenPGP: Implement pkcs15init-binding functions, which do nothing but are needed.
pkcs15init: Fix: sc_pkcs15init_update_file() retrieved wrong file's ACL.
The "file" variable is created outside when reading from profile file then passed to this sc_pkcs15init_update_file() function. So it may be missing ACL attributes.
selected_file is returned from sc_select_file() in upper lines of code, it will contain enough information (ACL) for sc_pkcs15init_authenticate.

Currently, the sc_pkcs15init_delete_by_path() function also use the "file" returned from sc_select_file() instead of "file" passed from outside for sc_pkcs15init_authenticate.

My change will make these two functions have same behavior (when authenticating file).
pkcs15init: Add more debug log.
everyauth 추가중
Merge branch 'master' of git://github.com/html5js/html5js-site
Always set the file.encoding system property when running Java
bracketed sprite path in bootstrap sprites.less not working from rails assets folder (fix icons not displaying)
doco for 0.2.3
Updated 6 package(s).

xf86-input-evdev: 2.7.0-2 -> 2.7.1-1
gtk3: 3.4.3-1 -> 3.4.4-1
glib2: 2.32.3-1 -> 2.32.4-1
gtk2: 2.24.10-3 -> 2.24.11-2
xf86-video-intel: 2.19.0-3 -> 2.20.2-2
awesome: 3.4.12-1 -> 3.4.13-1
seqMerge.pl changes
New InfoMessage Concept

Part I (still no unireader, crereader, filesearcher & fileinfo)
Merge pull request #352 from hwhw/NuPogodi-InfoMessages

New InfoMessage Concept
fix var name
fix #98
fix gemspec to build native extension
SVN_SILENT made messages (.po file, second try)

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/l10n-kde4/de@1300522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Bump TileStach version
Fix 24 hour clock
Add support for setting include and lib directories via environment variables.

* PYLIBSSH2_INCLUDE_PATH and PYLIBSSH2_LIBRARY_PATH are used if defined to set
  include and library paths.
메인메뉴 추가
bootstrap 2 based templates
Added exim4 support
Segunda version de preparacion
Tercera version de preparacion
Cuarta preparacion
Quinta version
Updating gh-pages with the most recent version of docs
Renamed WEB-INF and META-INF folders
Modified references to WEB-INF and META-INF
Node pages of description and how-to of views accordion demo
Fixtures funcionando correctamente.
sigh svn
"update demo - it now crashes"
Quick & dirty fix
Implemented basic UI style concept
Removed entire existing GUI subsystem
[#3] Fixed a bug in handling clauseless (defaults to match:) watch conditions. Now can match on specific qualified name
[#3] Remove not: which wasn't flexible, support wildcards in match:
[#3] Implemented negative rules again with a - prefix
setup pimp
added stringstream
complete coding of vos2
initial commit
Merge branch 'master' of github.com:ivycat/Posts-in-Page
Precompiled word recognition regex
The database file is now in charge of making sure that the database is set up properly.
添加ycl_block_term 扩展block_term 模块
epoch group insertion
zenburn cannot auto load rainbow-mode i guess
Nightly Commit. Refactors code into helpers. More work done on modules. Fixed bugs in the router middleware.
Stop dropping deferred table
validateOptions working in the CLI.
Highlight problem options.
Add "supports" commonJS option.
Add link to fix problems.
bash updated for knife
better config
[vim] added coffeescript syntax
Add and fix bundle plugins in vimrc
Disable git plugin from oh-my-zsh

It yields no significant benefit for me.
Rough outline to guide contruction of QR decompositon function
Added coverage data to rake spec runs
Capitalization change to work with the latest version of Cordova.
Merge pull request #1 from mressler/master

The Cordova variable isn't in the newer version of Cordova
Adds truncate method to String
Added git completion. Added more javascipt and html snippets
analitza, fix WANTLIB
add databases/mongodb.new, builds but doesn't generate libmongoclient.so
committing unfinished port and having a suffix of .new
Fixing index

fixing index
New flag thumbs
Working on parsing for score files; also working on creating SigFun objects from score files using osc
Minor tweaks in anticipation of writing more tests and use by others.
Got rid of classpath comments so it will work
forgot to change fd from testing
to create a grub2 bootable diskimage
[maven-release-plugin] prepare release tap-1.8
Revision#27
made the student login site
Merge branch 'stuff'
Add a CONTRIBUTING.md file.

This file tells would-be contributors how to make our lives as
maintainers easier. It's very much a first draft and I welcome your
suggestions and contributions.

I have submitted this pull request from the primary repo into itself so
that other maintainers may add stuff directly.

I purposefully made it much larger than most CONTRIBUTING files due to
the (ideally) large number of people contributing who are not as
familiar with the tools as we are. You might even note my standing offer
to help *anyone* who wants to contribute do so.
Fix erroneous link.
Warn people to fork before cloning.
some edits based off comments on the PR page
work better under Windows
use new files gem (works on Windows)
Merge pull request #102 from railsbridge/contributing

Add a CONTRIBUTING.md file.
Fixed broken Heroku version check step.
Update sites/installfest/osx_lion.step
Update sites/installfest/clean_up.step
fixed various non-code typos, grammar items, styling
Merge branch 'patch-3' of https://github.com/evilzero/docs into evilzero-patch-3
Merge branch 'master' of https://github.com/ellesuzuki/docs into ellesuzuki-master
Moved Heroku deployment into a separate page

Previously, users were prompted to deploy to Heroku four times
in the normal Railsbridge flow.

Now, users are periodically prompted to go to a separate page that
instructs them on how to deploy to Heroku if desired. They can choose
to visit this page as often or as seldomly as they like.
Merge pull request #105 from jessieay/master

added-exercises-to-beginner-slides
Merge pull request #111 from tjgrathwell/heroku_as_appendix

Moved Heroku deployment into a separate page
Testes 100 % e tudo funcionando
Added active button fixed margins
changed body font styles
murmur: require protobuf
added publicity page
Code cleanups and a few more comments
Added a .gitignore for binary disinclusion
Deleted unnecessary files
Fixed an error in the functional tests
Merge branch 'master' of github.com:jhbabon/notedetengas into 10-full-post
Images associations fixed, tests passing
working on product sync
delete atm files
jquery.mustache
index
self::assert* statt ->assert*
User::setPassword -> Post::setText (validator)
Compatibility fix to make RxUI 2.x code easier
Use a conventionless version of RaiseAndSetIfChanged so we don't break people who change it
Fix WP7 bug

The fact that nobody has caught this until now tells me how seriously I should take WP7 development
Demote some noisy log lines
Merge branch 'master' of https://github.com/xpaulbettsx/ReactiveUI
Updated RX to v2.0 rtm
fix pod rendering a bit in iir.pd
	modified:   META.yml
	modified:   Changes
Added some test for PHP Mapscript
Added labelLeaderObj tests
Add set() and and get() to the test
add test for worldfile override

mapserver/mapserver#2807 and mapserver/mapserver#4373
add test for multiline bitmap labels

c.f. mapserver/mapserver#4390
add test for clip/no_clip labels (#4391)
revert erroneous commit
add test for offset angle follow labels #4399

c.f. mapserver/mapserver#4399
add result for cairo (mapserver/mapserver#4399)
fix symbol used so it starts at 0,0

test was broken by mapserver/mapserver@30a939dd243cf0c546298d50b6f703919636ad19
in an attempt to fix mapserver/mapserver#4116
Added README, small modification to maps/helloworld-gif.map and
modification to layerObjTest
Merge pull request #1 from jlarouche/php-mapscript-test

Addition of php mapscript unit tests
Fix a few minor things in php msautotest
add test for mapserver/mapserver#4409
demime tests for \r\n (mapserver/mapserver#4430)
update results after fixing mapserver/mapserver#4142
Merge branch 'master' of github.com:mapserver/msautotest
add test for mapserver/mapserver#4433
Added a simple mode=indexquery test.
Added a simple mode=indexquery test.
Calcul II: control 1
FAPDS: notes control 1, solucions d'alguns problemes del tema 3
Added the nimbus classes needed for the paging view
Added the nimbus 'photo scroll view' to show the pages of a given score (and a new icon)
Don't need these any more
Added a "Portfolio" column for demo websites.
Adds html unescaping and different codes for style
jira_114 fix
jira_114 fix
Merge branch 'jira_114'

Conflicts:     Fixed the merge conflicts.
	a.c
Console. :D
Merge branch 'dev-main' of github.com:joe-zeng/fourstarmon into dev-main

Conflicts:
	src/Console.cpp
Adding note about IRC to README
Update README.markdown
Merge pull request #16 from jwietelmann/patch-2

A better description of how to use the window pane grid
added attributes to toggle the newer config file vars
apparently setting JAVA_HOME causes problems now
replace dead CMD build with better CMD INSTALL --build. Fix flipped bin/windows(64) directories
sfml 2.0 test
Merge github.com:joka90/SFML-2.0-test
Major update in stylesheets, (touch) icons, markup, etc.
Updated FTP Handler
Connect/Open/Upload/Progress
Feature: added flash
maybe fix
added assets
removed scaling
Finish renaming to "dropcards" (still a crummy name, but whatever)
Version que permite modificar los datos de un registro
goToSprite
enable high accuracy geolocation
Fixed defect and made `between` and `betwixt` now interchangeable.
make breadcrumbs more subtle
deploy w3 total cache
activate w3tc
commented out new % off gift cats
controller test working
some slight tweaks to make file, removing watchr script
e2e tests all messed up
sample integration
make integration that starts test server and opens up page in google
Add a bunch of missing recipe to build the image
Moves fixed positioning blacklist to jquery.mobile.support.js
Uses `position: fixed` blacklist to fix popup overlays in browsers that know what they’re doing with `position: fixed`, to avoid  monsterous overlays on long pages in some cases.
Merge branch 'fixed-popup-overlay' of github.com:jquery/jquery-mobile
Docs: removed pages that are not actually part of the docs.
Removed outdated Valencia theme
Removed outdated scrollview experiment
directly reference the tagged version of the authors text
Header buttons: Added "button" to the selector. Fixes #4638 - Using button tag in header will show title in new line [1.1.2.]
Update dbus to version 1.6.8
Python needs expat to build xml parser
Add skip-autogen="never" to freetype and zlib
Fix bad repo for pycairo in modulesets
Update dbus-glib, uncomment gconf's dependency on it


Seems they changed their minds about glib-dbus.
Added Defend Button
Merge pull request #366 from jseabold/version-fixes

Version fixes
DOC: Handle quote sets and escape periods.
REF: Deprecate order in fit and move to ARMA init
#13 Gestion asynchrone de la course
explore json
refactored demo page (still missing event handling demonstration)
resizing behaviour: fixed init object
Simplify Supported Protocols list

Signed-off-by: Jussi Virtanen <jussi.k.virtanen@gmail.com>
Associate SoupBinTCP with NASDAQ

Signed-off-by: Jussi Virtanen <jussi.k.virtanen@gmail.com>
Merge pull request #6 from jvirtanen/fixes/supported-protocols

Clean up Supported Protocols list
fix: Process TestRequests on session logout

While waiting for acceptor's FIX Logout response we are supposed to
process acceptor's Test Requests with our HeartBeat messages.

Signed-off-by: Marat Stanichenko <mstanichenko@gmail.com>
[ penberg@kernel.org: cleanups ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Restructure libtrading source tree

Restructure libtrading source tree based on the assumption that current
functionality could be divided into three parts: library core functions
and data structures, protocol or trading venue specific functionality
and testing tools

Given the idea described above and to make directory structure as flat
as possible this patch is introducing the following structure:

	* include/libtrading/*.h - core headers
	* lib/*.c - core source files
	* include/libtrading/proto/*.h - protocols specific headers
	* lib/proto/*.c - protocol specific source files
	* tools/* - testing tools and applications

This approach also establishes a standard way to use library headers by
external applications. Consider an example of some program using
libtrading functionaloty. If it has libtrading headers installed it may
have directives of the form "#include libtrading/some_file.h" or
"#include libtrading/proto/some_proto.h". Note that  it is the same way
as library source files are using them

Signed-off-by: Marat Stanichenko <mstanichenko@gmail.com>
[ penberg@kernel.org: cleanups ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
fixed multi query bug
Added adapters and mysql support
bumped version
Initial simple version
Remove tmp
Merge branch 'master' of github.com:jwermuth/tiny-wiggle
Voting mock-up so we can start designing
changing to "minimum number of families with hits" instead of maximum allowed misses
forgot some ()s
Site updated at 2012-04-04 09:45:52 UTC
Updated TinyMCE Yii extension to v2.0.
Updated the layout with Permission items. Added user gravatar to user menu.
Updated to use Permission items to checkAccess.
Since all usage of param['admin'] was eliminated, changed getName() to return user's name instead of email.
Updated sphinxapi.php to version 2.0.3.
Fixed a typo in user registration email. Thanks to Aidan!
cleaned up
Q is great
new dist
apache2.0 licensed
Updated tools to parse results for Plan1. (tools/crawler.py for Hadoop, tools/serial.py for serial output)
Fixing quick report problems
Internationalisation :speech_balloon:
awdklja
Commited
merge from lee
fix Kwb.java
Merge remote branch 'lee/work' into lee

Conflicts:
	src/commons/konoha2/Kwb.java
Merge branch 'lee' into work
combined Kwb.java
fix Kwb.java
add training4
Merge branch 'master' of github.com:kaorun55/kinectionjp
Support bridge id, bridge clientid and bridge psk.

Code from Thomas Hilbig, thanks Thomas!
Added local configuration file for testing and updated nconf path accordingly.
ignore xmonad-i386-linux
add Xmodmap config
rpm build spec: Updated to 0.10-release
Added some BuildRequires
Updated spec release version.
Fix Table::with()
Moved to better way of handling obfuscation, now mappings are stored in
one class to be shared globally between transformers
Fixed lots of bugs, working on a sheepDye event
Key movement bindings modified.
support clientOrBusinessName data parameter for clients.
add script_type to question
map root routes
reslove conflict
add question page & style
Merge branch 'master' of github.com:kenshin54/ScriptCode
Adding general plugins, themes, settings
Adding more settings
Adding color and theme settings
Lookup context.
Merge pull request #2 from zininserge/master

lookup context
fix a bug, cleaned code and updated examples.html
oulie save
Mention el colors in the app
Add link to finished JS
Create aplication files_upload
dos2unix ConnectionManager.php
Player creation wasn't returning the correct JSON according to the API.
fixed this.
mark as visited in directed graph
rewrite arg_alltest.sh
Initial check-in of Organya decoder.

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C526
- Fixed a crash on input destruction when no decoder was allocated
- Fixed a potential crash on invalid file or file read error
- Version is now 1.1

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C527
- Added an option to enable or disable looping
- Version is now 1.2

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C528
- Cleaned up advanced preferences a bit
- Added linear and cubic interpolation methods
- Version is now 1.3

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C529
- Normalized line endings
- Moved sample clipping to the correct place

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C530
- Added sample rate configuration
- Version is now 1.4

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C538
- Fixed beat to sample conversion so sample positions are calculated correctly for the full song lengths of all feasible .ORG files, even up to 192KHz
- Version is now 1.5

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C541
Major project file maintenance

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C717
- Removed interpolation modes and replaced with band-limited synthesis
- Version is now 1.6

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C733
- Added file read caching to speed up song loading
- Version is now 1.7

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C734
- Implemented loop count and fade control
- Version is now 1.8

git-tfs-id: [http://localhost:8080/tfs/DefaultCollection/]$/foobar2000/files/plugins.root;C753
All projects updated and now compile in the new git repository.
Added ignore lists for compiler output files
Fixed BaseClasses project name capitalization to correct version control tracking, removed TFS tracking files.
Added abort check to decoders
konoha2 switched to bytesize in karray

git-svn-id: svn+ssh://www.ubicg.ynu.ac.jp/svn/konoha-project/konoha2/trunk@333 c406673e-950c-47ff-9500-ef9fbfbf93bd
konoha2 bugs fixed at loading package

git-svn-id: svn+ssh://www.ubicg.ynu.ac.jp/svn/konoha-project/konoha2/trunk@298 c406673e-950c-47ff-9500-ef9fbfbf93bd
revert ulaw
Brainfuck 2d added
customized search panel added to ItemCreator
small resize
small resize
small changes
making creators more modular
ultra basic and broken version
Modification de fichier_en_cours
Ajoute de la mise en forme aux elements du menu
Merge branch 'master' of https://github.com/krazdax5/HobbyCartes
fixed bug in PrepareJAABAData.fig  -- made some columns not editable while debugging formatting issues.
changed rcfilename for deployed apps.
Added background to title screen
Added stylus module
No more slider.
Verbosity.
grab bag
Added settings activity, fixed bug when handling "sharing"
enabled solarized-light
Merge branch 'master' of github.com:lcancescu/vim_config
rename localization to location
Teste, ilton
Teste, ilton
Teste, ilton 2
Teste, ilton 3
Remoção do arquivo ReadMe
Demo improved by adding scale=.1 to large knob. Perhaps that should be a function of the element size?
doesn't use callbacks anymore, remove the reference to them
Fix de la case courante des joueurs dans la fenêtre
32Bit Support
ignored some files..
Mis cambios
fachada

Signed-off-by: Gabriel Fernández <gabofer82@gmail.com>
un monton de porquerias