labofsahil/github-event-dataset-2012 huggingface dataset:
Add semantic highlighting for symbols

Scala symbols do not have their own representation by a Symbol
type stored in the AST. Thus, they are highlighted as methods because
internally they are only passed as the apply method of class scala.Symbol.

To avoid highlighting symbols as methods scalariform is used to parse
them correctly and to make it possible to give them their own color in
the preferences.
add HTML export feature

does not sanitize css link
removing unnecessary explicit constructor
added XHR
Add travis badge to readme, and also hopefully kick off a build?
Update ivy/buildr for building in public environments.
Add commonInterfaces config, remove GWT hardcoding.
Add junit launch file.
Drop guava dependency since we only used it for newArrayList/newHashMap.
Fix leave handler.
Put swf in its own dir.
Update wiringPi/piNes.c

Fix double-double quote issue.  Fixes https://github.com/WiringPi/WiringPi/issues/4
Implement Miller formulas

Miller formula now works and should properly calculate
twist and stability. Also reformat the help system so
that calculating twist and stability are seperate
commands.
Update Miller class so that safe_value is an int
Begin filling default list of calibers
created new ThreeBS project
Begin breaking up functions into program
Add support for creating invoices; bump version.
Add support for list objects, and the new invoice lines API.
Fix test failures
Merge branch 'invoice-lines-support'
Smarter implementation of getAnnotations

Now also considers a type filter. (needed by Substance.Composer)
changed textinput event and cleaned the selection() hack
replaceing surface
replacing surface
merged in the new keyInput event handling and accent manipulation + selectionchanged updates
adding movement keys to iterm2
charmm-gui configuration file and layout
added c37b1 documentation and changed directory structure
updated apbs.doc to c37b1
mocha-milistone-0.1.4
request have only one copy of data
Merge branch 'master' into optimalization

Conflicts:
	libs/cailie/process_mpi.cpp
refactoring
Optimization in process_shmem
Refactoring of mpi_requests
Merge branch 'optimization'
Fix bug - open/save dialog is now in  current work directory.
fix bug in send event
Enjoyyyyyyyy
mosaic kai
Cleanup
Prevent markdown file whitespace stripping
Remove unnecessary newline
Add and adapt merge tabs from @r00k
Kate created a swp file i didnt want
Moved to HTTPS communication (used to be HTTP)
feature: category query
Fixed typo in ConstraintValidatorFactoryInterface PHPDoc (2.0)
.
.
Merge branch 'master' of git@github.com:syspot/zapeatsite.git

Conflicts:
	src/config/sql.properties
Revert "111"

This reverts commit 7a6c0591c4631a3a17bb2f4482418be337580d0a.
Revert "Revert "111""

This reverts commit cddc769f60692be329931bee2cbcbe29e58c3934.
Fix syslog for SERVER-6706
SERVER-6709 Don't call ->done() on a null ptr
revert part of change for SERVER-6706 - we can't change log format
index 表示の　speed　変更
Merge branch 'master' of github.com:tak0303/kakidashi
string comparator starts with '-' means descending order
add build.xml and README.markdown to top level.
Update tapif to attach existing tap devices
Implement a preliminary version of lwip-tap
分支测试1
工程文件
login修改
sdjafag
skasdkfadff
ahsgdsf
修改源文件
invitor
Merge commit 'dc1e7ffcb3f92c965dc3ee715eb29fd6378e5462'

Conflicts:
	.DS_Store
	Classes/LogInViewController.h
	ShangPin.xcodeproj/project.xcworkspace/xcuserdata/tangbinqid.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'newbranch1'

Conflicts:
	.DS_Store
	Classes/LogInViewController.h
	ShangPin.xcodeproj/project.xcworkspace/xcuserdata/tangbinqid.xcuserdatad/UserInterfaceState.xcuserstate
Some mappings and abbreviations
Mark PacketTileState as a chunk packet so it doesn't get re-ordered in front of data packets. Fixes many "invisible machine/pipe" bugs.
Set currentRequiredEnergy on tile load so the GUI doesn't show 0 progress.
Site updated at 2012-12-30 22:35:23 UTC
MDL-30643 - Fixed speed issues with stats generation.
MDL-30643 - Added additional temporary tables to deal with log growth in daily tables.
MDL-30643 - Moved table create/drop out of loop to fix performance issue.
          - Added additional output to weekly and monthly stat generation
Initializers are now converted to setup, which only act as constructors for the  controllers. authorization are now handled via middlewares.
Trying out dustjs, shit this is getting boring...
fixed a goofy display issue
Logging
- Changed namespace for Twoflogger and BlindIo to Ponder::Logging (making clear there's more stuff than just loggers).
- Added Ponder::Logging::LoggerList (to log with `@thaum.loggers.info('foo')`).
[AS7-3665] Fixing intermittent failures in SendMessagesTestCase
AS7-3808 Don't enable expiration reaper thread unnecessarily
AS7-4143 Failover scenarios often fail with "StateTransferInProgressException: Timed out waiting for the state transfer lock, state transfer in progress for view Y"
[AS7-3817] Remove test topics and queues from default configuration
AS7-4053 Unregister the cluster topology update listeners when the remote client disconnects
RESTEasy: TestCases for configuration parameter resteasy.scan.resources
Demonstration of AS7-3034 issue (ignored cases)
AS7-4208 Inconsistent behaviour when dealing with resteasy scanning context params
AS7-1954 in basic/integration
Change test structure
[AS7-5147] @Resource injection of BundleContext into ManagedBean fails
Add a complex CDI/OSGi integration test case
my.kv, resource for test.py added
File 2 modified from master
Small formatting change to titles in the README
Email compose card view layout refinement.
Merge remote-tracking branch 'upstream/master' into email-compose-layout
Change display type -moz-box to table.
Fix address input length.
Merge pull request #4026 from steveck-chung/email-compose-layout

[Email] Compose card view layout refinement.
Integrate AlarmAPI and SystemMessage part 1.
Integrate AlarmAPI and SystemMessage part2.
Integrate AlarmAPI and SystemMessage part3.
Integrate AlarmAPI and SystemMessage part4.
Integrate AlarmAPI and SystemMessage part5.
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into integrate_AlarmAPI_SystemMessage
Merge pull request #2564 from ian-liu/integrate_AlarmAPI_SystemMessage

Integrate AlarmAPI and System Message.
Add back the transition when showing/hiding keyboard
Merge with upstream
Fix the z-index and make sure the frame is hidden when the keyboard goes
Merge with upstream
Updating code
Fixing handling
Renaming data 
Adding test
fix indention
delete disposition
[F] bouncing of search page
[A] transition of background color
[F] indent
Backout the background color until UI/UX figure out what to do with the search page to avoid this ugly color change
Merge pull request #2810 from vingtetun/master

Backout the background color until UI/UX figure out what to do with the search page to avoid this ugly color change
Add back the background
Merge pull request #2811 from vingtetun/master

Add back the background to try the transition
Merge pull request #2804 from alivedise/homescreen-transition-v2

Homescreen transition v2(background color)
Remove the background transition
Merge pull request #2812 from vingtetun/master

Remove the background transition.
Merge pull request #2498 from riadhchtara/Issues/browseractivities

[browser] Web activities implementation for browser
Merge pull request #2785 from vingtetun/keyboard4

Add back the transition when showing/hiding keyboard
Working on oo_server_next.py
Minor fixes to documentation and package information.
Dumped data for south_0001.json for base model migrations
notify on user create
Only require version in gemspec

Using texticle master in a Gemfile using git fails due to failure to require active_record, which is required by the top level texticle.rb, loaded by the gemspec, which only actually requires the version.
Move `Texticle.version` into lib/texticle/version.rb
Merge pull request #18 from sj26/dont-require-in-gemspec

Only require version in gemspec
Redirect output to ~/Library/Logs/TextMate.log

Hesitant to not use the platform’s logging system (asl), but a simple log file is much simpler, especially when we want users to send us potential debug output.
Add bindings for findNextAndModifySelection:
Assert that settings_for_path is not used with /home

This is to track down an issue where opening files via rmate does use the virtual path when asking for settings or variables.
Remove debug code triggering abort()

This might be a 64 bit change that sometimes OFBPathInfoCell gets a negative retain count via our C++ instance data helper.

This should be debugged further!
assignment 2 task 2 done
1312
Merge branch 'master' of https://github.com/thanhson1085/moex
Added an helper title function
No more redirect.
Proxy passing by slash instead of domain.
No more blocking.
Root goes to public.
Finished a negation criteria package.
ohyeeah
ohyeah
updatezz
updatez
Renamed shader package in the plugins
Fixed GWT related issues
Create Postgres database after install

This follows the current instructions printed by Homebrew.
[testcase]调整 下载测试逻辑
Remove unused DBImpl::Select
Remove old SelectData/DeleteData. These are now implemented via iterator
Remove dead code
Add Iterator::Last
Add Iterator::First(); Add comment with regard to using Reset()/Next() pattern instead of STL pattern for iterator.
5

Signed-off-by: Tim Brockley <timbrockley@gmail.com>
3
final code for flask service api
now money prints next to the guest names
Session handling, logout now works
Merge branch 'master' of github.com:timvdalen/OGO-2.2
Added description
Merge branch 'master' of github.com:timvdalen/OGO-2.2
fix
Merge branch 'master' of https://github.com/timvdalen/OGO-2.3
center map on clicked marker, and move prev next links at bottom of popup window
code cleanup
closes #54 upgrade to django-storages 1.1.5
tinyplay: add clean shutdown handler for ctrl-c

Shutdown gracefully on ctrl-c signals
Add IPV6 support
Update yunohost_firewall.py

Remove name argument
fixed broken (if referenced by full name) link

Signed-off-by: Leo Bärring <leo.barring@gmail.com>
added option to have opening braces on same line

Signed-off-by: Leo Bärring <leo.barring@gmail.com>
Merge branch 'master' of github.com:tlvb/vim-protodef
work on timeout support for tasks
using namespace gg
Prepare for update.
Four new networks, and added user 'mindapples' to the admin list for networks.
Extra images for the new networks
Add sth.
minor change, no worries
Move knowledge of how to compose move complex querys like newsitems near here up; the query builder need only concern itself with solr syntax.
Pushing solr query ordering down into the solr query builder.
Add Ability to support binary body content, i.e. a byteBody (withByteBody)
repositioning moblie
fixing tab spaces
Merge pull request #1 from amedr/master

Fixing tabs spaces
Moved shooter results logic into the initializer of the Shooter_info class.
Removed reward split and changed IRC channel.
fixed installation issures
renamed a lock
Fixes for milestone 3
A painful commit but I did start high on the version tag
update to header.php
Fixed minor issue on the register view.
Дальше мучаем петов
Черепок дк - лечение
made primes a bit cooler
cygwin_setup.bat: add rebaseall comment
gen-po-invoice.py: add comment
gen-art-mart-checkin.py: convert to use cctools
basic method to not allow new requests, but needs to deal with messages already in mailbox...
raised an exception on upload if filenames are missing extensions
Merge pull request #2 from scjudd/master

Raise HttpResponseBadRequest on upload if filename does not have an extension
new inter_mcu links
Batch updates for counters

Runs through the mutate API instead of the dedicated counter API
Merge pull request #141 from nearbuy/batch-add

Batch updates for counters
HBase integration tests working
Merge pull request #4 from peterbe/hbase2012

Hbase2012
Add vim-tabular submodule
Add tabular shortcuts and more vimrc cleanup
Fixed login server error

Fixed the error with the CPPSLoginClient not being imported
Doxygen docs for TaskBase
cf-sketch support for contexts_text and recursive parameters
Editor get node or connection by id
kommentar
hallo
Fix indentation of license.
a = [] # mode == 0: (lb,rb,rt,lt) x 9, mode == 1: [[n,c],[lb,rb,rt,lt]] x 9
...
a.append([[norm, r * 3 + c], v])
...
v[pc][1] = self.RotVtex(direc, n_angle, w[pc][1], axis)
...
w = [(v[1][i][j] + self.ary_norm[n][j] * 0.5 * self.expand) for j in xrange(3)]
Revert "Fixed Unicode Wiki Word issue. Github issue #144"

This reverts commit 973c82793e6701735a0d4358c94ee1db6b78d27d.
Merge branch 'master' of https://github.com/unclebob/fitnesse into visually_impaired_friendly

Conflicts:
	src/fitnesse/FitNesseVersion.java
Tweaked styling to fit test-summary section better.
Missing the images
Fixed background position for test results line.
(partially) fixed Suite Overview page (#152).
Merge branch 'master' into visually_impaired_friendly

Conflicts:
	src/fitnesse/resources/css/fitnesse_pages.css
Style update for bootstrap theme.
Merge pull request #3 from amolenaar/visually_impaired_friendly

Visually impaired friendly
Merge branch 'master' of https://github.com/woodybrood/fitnesse into visually_impaired_friendly
Merge pull request #160 from woodybrood/visually_impaired_friendly

Visually impaired friendly
ZebraTrace wiki images
Send X-Robots-Tag: noindex in admin-ajax. props ryan, joostdevalk. fixes #18465.



git-svn-id: http://core.svn.wordpress.org/trunk@20288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove step="" from upload size inputs, as the step is enforced in the spec, rather than being a recommendation. finally fixes #17863.



git-svn-id: http://core.svn.wordpress.org/trunk@20289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Theme Customizer: Add 'choose image' functionality to image controls. Rough first pass, using header images as an example. see #19910.

git-svn-id: http://core.svn.wordpress.org/trunk@20290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.4-alpha-20291.

git-svn-id: http://core.svn.wordpress.org/trunk@20291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
一部環境での再構築不具合対策
registro de llamada 2
Done with sign in
refactored test helper
Done with user edit/update, index, and destroy actions
add partial _fields
signin and signup page only for no-signed users
admin can't delete himself
Multiple changes to the library
Added a TNS calculation script
Merge pull request #1 from spond/master

Updating to sergei's latest tweaks
Error fixed: clicking on account when not logged in now redirect to log in page
After signin up it redirects to home page
Merge branch 'master' of https://github.com/vegaro/wetradefun into Victor

Conflicts:
	user/views.py
Merge branch 'master' of https://github.com/vegaro/wetradefun into Victor
Changed button and status on trades so that it appears according to the offer status
Merge branch 'master' of https://github.com/vegaro/wetradefun into Victor
Fixes number of listings
Merge branch 'Cesar'
Merge branch 'master' of https://github.com/vegaro/wetradefun
Minor front-end changes
fixed login page maybe
primary key error fixed
fixed login/create account
Merge branch 'master' of https://github.com/vegaro/wetradefun into Victor

Conflicts:
	trades/views.py
	user/views.py
Merge branch 'master' of https://github.com/vegaro/wetradefun into Victor
committ
Merge branch 'master' of https://github.com/vegaro/wetradefun into Ellis
Fix description of dns_failover_on_503 field.
Make a basic user model including secure password
Finish user signup
Finish sign in
music_video hardsub and subtitles
Remove unneeded unmaps from b:undo_ftplugin

The "im" and "am" mappings are present a bit later in the file and the
"ic" and "ac" mappings are not relevant anymore.
Added support for YARD todos.
Merge pull request #116 from irrationalfab/yard-todo

Added support for YARD todos.
Added .txt files to gitignore

Signed-off-by: vincent <vincent@clickinglabs.com>
Added support for Bing. Now searches Google and Bing on two separate threads.

Signed-off-by: vincent <vincent@clickinglabs.com>
Add MessageThread singleton
Add Command :Clib
Added utils.clean()
Refactored to utilize utils.clean()
trim clean() result
Introducing Bootstrap\!
work on postgres install
Added missing @Override annotations.
Removed unnecessary casts.
Removed unnecessary @SuppressWarnings("unchecked").
Removed redundant superinterface NiftyControl (alread covered by Menu).
Added @SuppressWarnings("rawtypes") to silence warnings.
(Fixing the missing generic arguments would be preferrable in the long
run.)
Removed unnecessary explicit transferral of 'nifty' member to private
nested class (these are automatically transferred as needed).
This was done to silence a "local member hides member of same name in
outer scope" warning.
Added missing @Deprecated.
Removed unnecessary semicolon.
Replaced somewhat simple equals() method with the Eclipse-provided
template.
Added a hashCode() function to go along with equals().
Added @SuppressWarnings("unchecked") to silence an unnecessary warning.
Removed unnecessary imports.
Suppressed warnings:
- Deprecation
- Undocumented empty block
- Unhandled tokens in @SuppressWarnings
- Unused imports
- Unused private members
Merge pull request #45 from toolforger/cleanup

Cleanup
More Cleaning!
+ testing: Added BootProgress Bar -> https://github.com/CheckROM/DK_S2_ICS_KERNEL/commit/81c6d0c3dfbb96e701c95bd16ca18cb3bcec3135
wakelock: main_wake_lock fix by tungstwenty
Merge branch 'master-3.0.y', remote-tracking branch 'dorimanx/master-3.0.y' into master-3.0.y

+ ...
Merge branch 'master-3.0.y', remote-tracking branch 'dorimanx/master-3.0.y' into master-3.0.y

+ ...
mxt224_u1: do not track gestures when the screen is off
Moved Payload to initramfs, tuned GOVS and Voltage + settings.
kantjer@xda managed to compress recovery logo by 50%! TNX!
ZRAM Update by VOKU! > https://lkml.org/lkml/2012/11/2/29
Zram now works with ZSMALLOC, should be faster
cypress-touchkey: DMESG logs clean.
Optimized all Recovery Images using VOKU script. :) 25KB lost.
Revert "Optimized all Recovery Images using VOKU script. :) 25KB lost."

This reverts commit 00286597b16c8296b884e4e07d1cc0f010fe4c71.

Cant install via recovery, looks like it's didnt like the shrink :)
Oh well, never mind.
Kernel 7.16 ICS-JB-MALI + sattings tune.
Rest in peace battery and touch keys debug messages.
Kernel 7.17 ICS-JB-MALI, most changes in INITRAMFS GIT.
Merge branch 'master-3.0.y', remote-tracking branch 'dorimanx/master-jelly-bean' into master-3.0.y
extended Album model to support different image sizes
updated some tests
all PUT actions are passing
all PUT actions are passing
all tests for albums are passing
Fixes
Fixes
Merged changes
Use native oh-my-zsh git completion
Commit from: Mon Mar 12 13:19:25 OMST 2012
More explicit close messages
Moved unlink function from MeldFsFuseAdapter to MeldFs.delete
Enhanced multi-source operation to be able to return exceptions
Moved rmdir function from MeldFsFuseAdapter to MeldFs
Improved rmdir() function to return actual errors encountered while removing directories
renamed "delete" function to "rm"
Added comment to rmdir function
moved rename() function from MeldFsFuseAdapter to MeldFs
moved most of readdir() function of MeldFsFuseAdapter into ls() function of MeldFs
made runMultiSourceOperation() function private
Renamed FileHandle to FuseFileHandle
Refactoring parameter name of ls function for clarity
Moved mkdir function to MeldFs from MeldFsFuseAdapter
moved link() function from MeldFsFuseAdapter to MeldFs
準備丟出 0.1 的正式版本
Remove ASTree.php, create Function Parser and Function Interpreter
[vim] Add fontzoom plugin
[vim] Remove own font-size plugin
[vim] Update mappings for changing the font size
Update ignore patterns
[vim] Move all plugins to bundle/ directory
[vim] Update bundle updating script
Properly handle dangling symlinks in update script
heniek photo
more past events
Refactored Markup to use AbstractPluginManager

- Removed ParserLoader, ParserBroker, RendererLoader, and RendererBroker
- Added ParserPluginManager and RendererPluginManager
- Refactored Markup to use ParserPluginManager and RendererPluginManager
- Ensured all tests pass
Increase tmux default history limit
Remove git dirty due to cost
Display time correctly regardless of locale
Corrected minor typo in readme.
Merge branch 'v3.0'
Attempting to return false to prevent jQuery Mobile intervention on same page links.
Fixed the playback issue in IE8
Removed the gap between the video and player UI
Added aria-live=off to the progress bar to prevent conflicts with screen readers
Changed the multimedia player progress label
Merge pull request #333 from LaurentGoderre/feature-multimedia-player

Feature multimedia player IE8 playback fix and a11y improvements
Corrected numerous structural and display issues with the site menu, footer, splash pages and server message pages.
upgrade virtualenv to 1.8.2 in setup.sh
same procedure.. 2nd commit via tortoise
Обработка почты
apr 13 310pm
apr 13, 336pm
implement publication date for posts, reverse chronological listings for blog, and limiting blog display to 10 entries
Bugfix: modification history is retained when app returns from the background
ADD: 01-linux Ŀ¼
update
Merge branch 'master' of github.com:woshifyz/megabook
dev_extra
posting job now works for GPEN admins
Finished chapter 8
Done with the sign in
Update awt.geom examples
Updated ignore file.
Merge branch 'master' of https://github.com/wsheppard/quartus into new_branch
Ensured consistency of repo
latest test jar
made it so that on a reload the danger item list will be reloaded incase
that was modified
Phoenix: few corrections to the overviews; Added some more contributed snippets; Fixed some more converted snippets; Added the correct interlink references in the `etg` files; better handling of the Doxygen stuff.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
count's value
Added pilot sprite

:3
remove clang-complete
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages
add demo on page
Merge branch 'gh-pages' of github.com:xingzhong/ssptool into gh-pages
add link button
merge
solve a display bug
Implementing traffic usage dialog on hovering over username
googlemap表示のためmain.cssを修正
Add code to create Shell shortcuts
remove zf2
problem 55 and spec
Change-Id: I3f8b081d8710d65642f3ff95ab49cb5030be7279
add QR2011A.py
add element
add new projects
Merge branch 'master' of https://github.com/yanock/c_projects

Conflicts:
	base.cpp
DOC: wikipedia reference for dCOV
DOC: added some fresh modules to modref
DOC: Changelog -- Expanded, fixed references, and adjusted previous entries for more uniform appearance
DOC: minor
BF: allow to h5save to current directory ;-)
show userdata in table
indentation
UI for modifying snapshot data (WIP)
read desctiption also for post snapshots
enable editing pre/post snapshots
radiobuttons not needed
Merge pull request #7 from jsuchome/master

modify snapshots (WIP)
updating the git repo, because it's grown quite out-of-sync
Add aptana-studio-bin ebuild
419: Fixing issue with paths to assets in compass by feeding compass config relative_assets: true
Merge pull request #128 from Malese/compass-asset-paths-issue419

Fix issue with paths to assets in compass. Partfix of #419
delegate add
simplify nmconnection.py
put display value in correct model
repackage acceptance test utilities
add: ShogiBot as a library
modify: order
Added about me cookbook
Feature: default sorting order
v0.31

commit with some crontab scripts
Add NERD_commenter & surround plugins
Add my conky config and fonts
Merge branch 'master' of github.com:zatamine/dotfiles
[Mvc][Doc] Fix syntax issues

Fix DocBook syntax issues introduced in 6fb2c39c39e3f6fa337804ee962fe27488ce947c
[View][Doc] Replace <ulink> with <link>

<ulink> tags are not compatible with DocBook 5
[View][Doc] Fix example id
Merge pull request #1528 from Maks3w/docs/fix-documentation

[Documentation] fix documentation syntax
Remove --stderr switch from Travis test runner

- Appears that it may not be necessary
Remove old stuff

* Remove PHPTools (PHPNamespacer)
* Remove zf1 mvc
Merge branch 'remove-old-stuff' of https://github.com/Maks3w/zf2
Merge branch 'remove-unused-private-fields' of https://github.com/rtuin/zf2 into hotfix/remove-unused-privates
Rss improvements

Removes use of raw Get() when it should have been using a proper object
method.
updates the release number
Merge pull request #102 from zenphoto/nov_14

Nov 14
New key binding and turning of auto-complete for nrepl.
Fixed edge removal bugs @@
add new gps demo
Refactored moveable platforms into the SlidingTile class. Doors will be added as DoorTile classes and both SlidingTile and DoorTile will inherit from MoveableTile.
Progress on doors.
* Bound E and R keys to opening and closing doors respectively (for testing purposes only).
* Player can fall below the world (and die) and fly above the world (and die).
Added doors (UNTESTED!)

Merge remote-tracking branch 'origin/doors'

Conflicts:
	PlayDead_PSK/Platformer/Platformer/Level/Level.cs
	PlayDead_PSK/Platformer/Platformer/Platformer (Windows).csproj
	PlayDead_PSK/Platformer/Platformer/Tiles/MoveableTile.cs
implemented looting corpses
Remove the old Makefile
added rubyforge project to spec
Canonize typical patterns.
bundle script
Fix the hash size indication during test vectors generation.

The internal state size has been shown instead of the hash code length itself.
Improve the way hash code size is specified and processed.

Also renamed ``hash_length`` to ``hash_size``.
Rewrite test vectors generation function.
forgot deftype-once
Fixed entry display
make compatible with Go1
	- 'os.Error' -> 'error'
	- 'Size' -> 'Size()' in FileInfo
	- 'os.NewError' -> 'errors.New'
	- update example, as well
Modify framework default.html to define Jscex
just show me what .select and .partition return
Merge pull request #8 from scribu/patch-1

just show me what .select and .partition return
add rails and rspec rules
fix bug that we cant store integers as key in a vocabulary of a at-field
Added browser view for live search replies.
Fixed calculation of selected facets when the facet value contains non-ascii
characters.
Makes the Logger a singleton! Yeah everyone hate these
Adapting the PageController to disable Navigation according the new Navigation usage guideline (which not exists ;-) )
Bootstrap Base

Along with initial pass at index structure for testing
misc ff fixes
Prototype interface avec Workspace.
Prototype interface avec Workspace.
General cleanup, better encapsulation
[Bukkit] If you are Bukkit then hacks are in this season.
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
fixes for structure index defining
more fixes and impovements
Write and restore pch dependencies
Enable symbol name completion for all symbols.
Update
Make writing buffer more for listsymbols and findfiles. This solves a problem where the socket gets the finished event before receiving all write events.
Compile
bigger buffer
Make MemoryMonitor on OS X use Mach APIs instead of invoking an external program each time
Update libs/NiftyGrid/GridPaginator.php

syntax error
switch to camera branch
modified:   src/linking/tunroutine.h
	modified:   src/linking/wlanroutine.cpp
Ajout du traitement des paquets PKT pour lesquels NextHop=nous
Raplace favicon.png with favicon.ico, for avoid bad requests
Added route for error module
Added _loader for CLI and Web
homepage update
Merge branch 'master' of https://github.com/Artisans/RSOsytemm
CLOUDIFY-1146 upload jars and zips to S3 folder according to new maven convention
CLOUDIFY-1131 do not update rest.war with explicitly created restdoclet
Build version advanced to 2499-102
Build version advanced to 2499-103
Merge git://github.com/CloudifySource/cloudify
Handle the new behaviour for invalid instances.

The behaviour of this case changed with bug/836978. Requesting the
status of an invalid instance will now return an error message
including the instance id, so we need to filter that out.

Resolves the devstack elements of bug 836978.

Change-Id: I385eb6f04cff90e1ddc0b79d835fbbdf92e4e9ff
adding support for baremetal hypervisor

New files for baremetal driver:
- lib/baremetal
- files/apts/baremetal

Adds two dependencies:
- google shell-in-a-box
- diskimage-builder

Enable by setting both:
  VIRT_DRIVER=baremetal
  ENABLED_SERVICES="$ENABLED_SERVICES,baremetal"

Change-Id: Ibf6fe1671a759a449c9eb0df47751d1b31ade591
update baremetal option names

update power_manager and instance_type_extra_specs config opts
to match the new values in nova, introduced by
https://review.openstack.org/#/c/17994/

Change-Id: Ic624362df17c217406e142ef4c2e65a4c0c2765d
Add fake env support to baremetal

Use bm_poseur to create VM and network bridge
so that, in the absence of physical hardware,
baremetal driver still has something to manipulate.

Change-Id: Id80ede13a35e4380f358b47f08d41ff98ea9d70f
enable xtrace for keystone_data.sh

This is useful for troubleshooting keystone errors.

Change-Id: I9b50e88e30d71afd17549d42f04f07a95815906e
update list of files for git to ignore

These files are all created in the course of running
devstack and openstack but should not be tracked
as part of the devstack sources.

Change-Id: Ia3939c6e20f8d6fadaa18d2f3619361dc9375696
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Merge "update list of files for git to ignore"
Merge "enable xtrace for keystone_data.sh"
Added some makefiles for convenience
Hopefully edible for heroku
shake hand
SQLWorldFactory done. See #230
Added some comment and test code for converting in factory. See #230
Some correction in the worldConvertor. See #230
NPE Check from ESS importer.
Since I get only String from the database, added some modification in
SQLOBjectContainer to parse the string into the wanted value. See #230
More work on the PermWarps. Some reverts to the previous permwarp
commit. See #196
Some Optimization in the Downloader with better check of the version, we
need now to add the size of the file as second line, it's to avoid using
uncompleted downloaded file.
Added comment on the checkVersion of Downlader Class.
Minor browser compatibility issues
Moved test file pattern to the settings file.
Renamed all test files.
Renamed persoa_main to app. (Folder will be moved next commit)
Moved persoa_main to app.
Moved views into subdirectory
Other views
die if element has no category; moved progress message out of loop
moved getName() and getProcessor() into ObjectAdapter
Done some stuff
Merge
added folder for porkmirror
first commit for porkmirror
now keeps a history of changes
replaced log4j.properties with log4j.xml; added logging for database queries; updated table schemas; fixed some bugs
updated pom.xml to not include Hibernate SQLite dialect and removed log4j.properties
added global try/catch; updated some of the logging statements; database query logging now escapes input; updated log4j.xml
added a few tweaks and fixes; added ScalaEntryPoint.java for making a runnable jar
console shows current progress; added faction field to player table
renamed /src/main/resources to /src/main/config
pom can now compile scala classes; pom copies dependencies to target/release/lib as part of package phase; pom copies src/main/config to target/release as part of package phase
add custom jar configuration to pom
small fixes
added batch file for packaging
updated log4j.xml
updated to use latest version of log4j-rolling-appender
Merge branch 'master' of github.com:Budabot/PoRKMirror
Added a couple preseason game data.
3D sound now works for all powerups. A bug where some sounds would change pitch is fixed now I believe, by setting the default velocity of sounds to 0. -Kyle
Initial Maven profiles for different hbase versions
Ready to branch out for CDH4
"Compiles, HBaseFacade junit fails, to be fixed"
"CDH4 junit test cases run succesfully. Yet to test integ"
Updated README
"eclipse stuff"
eclipse stuff
	new file:   .externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
	new file:   .externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder.launch
	new file:   .externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
	new file:   .externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
Added target to gitignore
More eclipse stuff
Merge branch 'cdh4'
"Removed eclipse files"
Removing eclipse stuff"
Rm manifest file
CommitterChecklist.txt created
Merge pull request #16 from shivangbadaya/master

CommitterChecklist Created
Read db stuff from one place
git commit "read db properties from one place hibernate.properties"
Merge pull request #17 from amitnube/master

sending a pull request
git commit "Parameterize all versions in pom.xml"
Merge remote branch 'upstream/master'
Refactored Cleeng Open so that it is now based on stable ZF2 release
cleaned vendor dir
use latest bootstrap & jquery
updated styles
- improved typography on small mobile devices
- added active month highlighting to archive widget
- updated grid for high resolution screens
GameStages Version 1.0

->Need to fix TItle still
	->Will be finished when I wake up
[Fix #260] Add peepcode theme
[Fix #263] Revert "Ensure that $terminfo values are valid"

The VT100 terminal application mode is an old relic that is no longer
needed.

This reverts commit a5f8d04d34bc2c935d086c1e7a9f598279e8817f.
Do not set Terminal.app window, tab titles to $PWD
[#245] Convert helper into a module
Merge branch 'master' into prezto-home
comp order
fixed direction bug between display and button

-fixed bug with multiple directions at one stop
Moved HTTP module initialization to the HttpApplication.Init method.
add function auszahlung()
support CM_EXTRAVERSION
Initial WHOIS and DNS_Query object commit
Removed email_to_cybox
Added master copy of email_to_cybox
updated get_file_size to use the base64 decoded size rather than the magical constant approach
Merge pull request #1 from mrichard91/development

updated get_file_size to use the base64 decoded size rather than the mag...
Added v1.0 final common bindings, reorganized folder structure for more accurate versioning
Merge branch 'development' of github.com:CybOXProject/Tools into development
Removing common_types from Common root
Added v1.0 final core bindings, reorganized folder structure for more accurate versioning
Added new and updated object bindings for v1.0 final
fixed an issue with the SimpleHashValueType binding
Changed the core and common binding filenames to be consistent with object naming conventions. Updated the object bindings to point to new core and common bindings
Adding core and common files that were missed in the last commit
Adding core and common files under Objects that were missed in the last commit
Fixed *ObjectAttributeType datatype declarations
Merge branch 'development' of github.com:CybOXProject/Tools into development
Fixed *ObjectAttributeType datatype declarations
Fixed SimpleHashValueType default datatype
Fixed extraneous common usage in LibraryType
Fixed buildChildren methods for several classes
re-applied separator bar to the layout
file organization & readme
updating proposal and main page
lambdaize the rhs of o-defintions
gemfile rakefile update
really final comit vor version 1 of wanderroute project
Remove set -U fish_key_bindings

Instead, add this snippet to ~/.config/fish/config.fish:

. vi-mode.fish

function fish_user_keybindings
	vi_mode_insert
end

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
Currency detection update form Nuno Gomes - make addition of extra symbols easier - add euro
Update to current type detection - Nuno Gomes points out that European convention is not always to have the € first - you can have it at the end etc. As such, rewrite this plug-in to be a lot more lenient as to how it detects currency. Also use a regex rather than looping over the characters externally, and cope with non-string data.
Fix typo in jQuery for fnGetColumnData
Fix var error in fnSetFilteringDelay - just a warning, but good to tidy up
Fix - btn class should not be removed when switching between disabled and enabled states for TableTools buttons
forgot to re-add $cookies=array()
no really, there's a lot
Added SetSpawn and Spawn commands, moved command

registration out of the main class, added a dummy SBBase class for
instanceof tests, and added many small tweaks.
Add a theme for documentation
updated map generator
test
xls
Refactoring the core a bit and adding some more comments.
Updating the documentation.
Google Maps module stub.
Removing unused cached function and clarifying a comment.
Adding version information.
Site updated at 2012-12-30 14:09:40 UTC
Баг в javascript
add reset override and fix issue with links not having an actual link
V1.7.0 Build 16

Added equipment support
[BACK-29]
-Added 'Boekbaar' Column to the BookingCreate window
-Added 'Zoek auto's' button to that same window
[BACK-37]
Added hardcoded array of monthnames. Seemed to be missing in firefox?
[BACK-37] Reverted change for monthNames.
[BACK-37] Fully reverted
[BACK-29]
-Version stamp updated to V0.7
'Lol'
Merge branch 'release' into accept
[MERGE FAIL]Merge branch 'accept' into develop

Conflicts:
	BMUMigration/Wheels4AllBookingMigrator.php
	workspace.js
[BACK-52]
- Created new API function which allows custom filters to be added to persons
- Fixed 'Nieuwe passen' scherm.
[BACK-UNKNOWN] Fixed status SMS window
project and solution renaming from old company name
namespace changed to TabulaRasa
slight changes to support new naming of library
Split up q2 queries
Remove underscore from messageTemplates variable in AbstractRecord
Merge pull request #83 from adamlundrigan/patch-2

Remove underscore from messageTemplates variable in AbstractRecord
Added missing variable declaration
Merge pull request #84 from varatada/master

Add missing variable declaration in src/ZfcUser/View/Helper/ZfcUserDisplayName.php
Proving corollaries of Riemann approximation
modified:   first_form.py
	modified:   main.py
Mongoose connection to AWS mongodb
Fix #121: Packaging: netperf conflicts with other packages
Update src/messenger.js

增加target参数支持，使得实例化时属性target能支持jquery, iframe, string, window四种对象类型
Agregando Script oculta-iconos.sh
register system with bcrypt complte and design system fix
stuff

RT
adding a long lost vote.js file
Merge branch 'master' of github.com:FinalsClub/djKarma
move fb credentials to credentials.py
remove autocomplete references. no longer using this package
StringExtensions add IsNotNullOrEmpty
Can now password protect comics (stops display of comic & gallery & post from showing until password entered)
changes to launch files
merge
Improve encrypt/decrypt test
Merge pull request #12 from idodeclare/improveUnitTestCase_1

Improve encrypt/decrypt test
browscap-4973
aaa
Merge branch 'master' of github.com:Geisterwolf/FooBar
Directory opgeschoond
Aanpassingen in de API index.html

Bij aanroep van de api zonder api.html wordt de index.html getoond deze
bevat is aangepast aan de huidige versie van de API.
updated READMEs
Merge commit 'gerry/develop' into develop
further cleanup and standardization
...
Update subprojects
* amelioration affichage
Rattata Pieces final
JUnit obtenerServicios
Otro JUnit obtenerServicios
TestGestorBD2
Homework 3 is uploaded with example.csv
2nd homework is now written in ruby
Moved Symfony/Console dependency to suggest. Removed Symfony from classloader Doctrine Folder
Tests for Message Boards updated
Traveler fixes...
Add debughangars setting used in previous commit.
TESTING ON CLICK EVENT
RoundhousE Raven-Entity-Name
More redundant content removed
Merge branch 'my_branch'
Merge branch 'master' of github.com:Irkka/ohtu-viikko1
Fixed more grammatical errors in about window, added JRE7 support, dropped Runtek5+ support - removed Component.class which made the jar size smaller, added multiple link support for interal script compiler, added further script check, other small changes.

Jar Hash: 3A8C1C63A41C89B74C23FF5E0F3D3F63
[rspec] small changes to get better test coverage
[rspec] mock package kit
Merge f:pbrane; apply accessor changes
onClick is the problem
heroku problems, might be same issue I'm having with jade global install
heroku problems, might be same issue I'm having with jade global install
heroku problems, might be same issue I'm having with jade global install
heroku problems, might be same issue I'm having with jade global install
[html] Removed invalid DOCS entry.

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: C0174749
Revert "[maildirproc] Updated for distutils-r1 usage."

This reverts commit 1fc449a3f649955668f02d4874a7acaf3f9319cc.
Revert "[maildirproc-python2] Updated for distutils-r1 usage."

This reverts commit fc473434183696bf3b3608a0bd0a0f702737c59a.
Merge branch 'feat/distutils_r1'

* feat/distutils_r1:
  Revert "[maildirproc-python2] Updated for distutils-r1 usage."
  Revert "[maildirproc] Updated for distutils-r1 usage."

Conflicts:
	metadata/md5-cache/mail-filter/maildirproc-0.5.0
	metadata/md5-cache/mail-filter/maildirproc-python2-0.5.0
Updated metadata cache for upstream's eclass changes.
[luainotify] Use public-domain for licence, not as-is.

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: C0174749
[adsuck] Use MIT for licence, not as-is.

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: C0174749
Enable argument pass-through for generate.d
Lv 43
set a default state
Adding page 1 of news feed
Overload all opEquals and opCmp from Control.
Using more appropriate approach.
Add ClippingForm(and RegionRect)
Added clippingform for compilation.
Changed the exception message into English.
Added SharedControl.

SharedControl class is shared class. And this class can be an argument for spawn.
This change supports warning and deprecated codes.
Fixed bug.
Merge pull request #6 from shoo/master

Pull request for SharedControl
By this update, SharedControl.invoke and delayInvoke supported parameters more than 2.
Merge branch 'master' of git://github.com/Rayerd/dfl
Member functions of controls are added @property annotation.
Other modules are supported @property for functions.
Add -wi to makelib.bat.
Remove some warnings "statement is not reachable".
Fixed an assert expression.

Points more than two are necessary to draw a line.
Merge pull request #3 from he-the-great/overloadfix

Overload all opEquals and opCmp from Control.
Remove -d option from makelib.bat
AsyncSocket.blocking property is now const property.
Followed typedef deprecation.
varaston testit
cycleDeVieGlobalePartie.sequencediagram
Add Input callbacks with Screen classes
Add placeholder menu screen, corrects callback function mistakes
Adds debug to all titlescreen and menuscreen functions
Revert "Init Commit"

This reverts commit 5bd0c0926c7eee08e3807883e6db0877955daaba.
Added command groups functionality to space system model.
FramePayload now implements Serializable.
MySQL: Connect, insert, remove test complete and passing
Fixed Bug 50.

Predicition attack won't shoot anymore when predicited target position is
out of range. Removes unit from its towers unitset (so it won't be
selected again...)
Merge branch 'master' of https://github.com/JonasGoldt/TDGD_TD
Flatten hierarchy tests
Dictionary mapping & reference equality changes
High resolution image rescaling and adview centering
Stubbed in support for Safari
Attempted to make Safari support more robust
Merge pull request #107 from toji/safari-runner

Added (some) Safari support to the test runner
Refactor/clean CheesesController
Do not add requirements for routes
Lowercase repo alias
Routing/Base repo updates
Merge branch 'master' of github.com:KnpLabs/geekweek12

Conflicts:
	src/App/Controller/CheesesController.php
	src/App/Resources/config/routing.yml
added some more subscription tests.
minor refactoring.
Testing out a .masssummon command.
Satus sign >:P now workin
- added missing namespace
- removed verify files
Add Craft Beer Web App
Added Bootstrap
Merge remote-tracking branch 'origin/master'
Add message partial
Better rounding in RpgPlayer#ignite(double)
Make sure we handle correclty the trailing whitespace in the different buffer
SessionComponent, SessionHelper, major debug changes and minor changes in model, layout and stylesheet and small tweaks.
Quick Readme change.
Modification de la ligne de commande
replace guard gem with event machine based file watcher; enable watching with --watch build flag
Update Interop.cs
Bug correction, finalise Friends functions.
Merge pull request #1 from MerlijnWajer/master

Pull from main repo
Update Units/MMLAddon/PSInc/Wrappers/tpa.inc
Update Units/MMLAddon/PSInc/psexportedmethods.inc
Update Units/MMLAddon/PSInc/Wrappers/tpa.inc
Merge pull request #127 from mormonman/master

MiddleTPAWrap
First version of character select screen;
First version of character select screen;
Merge branch 'test' into master-2

Conflicts:
	res/gameScreen/star.png
message to aashah
DB/Loot: re-assign Gunship 10N reference

Closes #6648
DB/Creature: Add some VehicleId info from sniffs&UDB

thx Faq for the comparison with UDB, PitCrawler for the additional sniffs
Closes #6196
DB/quest_template: Fixing Required Races on Quests 8553 and 8554 to allow for Alliance completion.
By warriorpoetex Closes Issue #6629
DB/creature_formations: Set Fel Steed Formation/Group Combat Assistance
Fix by warriorpoetex. Closes issue #6629
DB/gossip: Add missing gossip for Book "Soothsaying for Dummies"
Closes Issue #6652
changed google oath for server
update instructions
remove the duplicate git install
remove comment
remove the no longer needed --no-rdoc --no-ri
fix the apache-utils install command
remove non-existant users group from being assigned to the deploy user
[maven-release-plugin] prepare release ts111ga
[maven-release-plugin] rollback the release of ts111ga
[maven-release-plugin] prepare release ts112ga
[maven-release-plugin] prepare for next development iteration
Update Issue 18

Backport to TelScale branch

JSIP-416

Better exception handling when there is no CallID on a message received over NIO+ removal of USE_NIO property that wasn't used
(cherry picked from commit 9781dbb08ad8e289b3ec1aa1af22cb53b10de422)
Added services for users.
added setters to login class
Move upgrade-cdh-libraries.txt to patches subdir.
path to unix socket now a global define. server side tile directory has configuration default
Added RestOpenGov.js demos
Added tmp folder
Mini BD Gasolineras con coordenadas

Esta en mi carpeta de pruebas
修正以前将performer称作unit时的一些遗留代码
完成定时器事件
Fixes #2860 : Enforce the ordering of directives when writing promises
Merge branch 'branches/rudder/2.4'
Removing wrapper exceptions
New PNG image generated
massive refactor and improvement of tests.
Fix config, struct, load config, and more ...
improved SimpleDateFormat Date parsing, handling of expired trains
added ginger modal view
Update license in README and add comment on top of main file (opds)
created visitor claiming tickets. refactory to disable user's links)
Prasanna: Added Org in seed data for users
#1405,1396 Pavithra|Kavitha 'Select all records' fixed in search and advanced search
Merge pull request #291 from prasann/master

Added N/A as Org for seed users.
Fixed the preloader of the infinite-scroll plugin on the home page.
Minor updates on the base template.
switched to hexpat
done tracepath in separate thread
MANY changes: better url+begin to log events+various improvments
Menu dsl
nginx.init.erb > init.nginx.erb
will be introduced on a later stage
integrate cool features from @h5bp
The missing Gemfile and metadata
trailing whitespace
~ nothing of value ~
More/Organized mimetypes,  from @h5bp
nginx.init.erb > init.nginx.erb
A default site
Update configuration templates
Reorganize and improve main configuration file
Helper function
bump nginx to 1.2.5 stable, some 3rdp modules, updates
remove ark requirement, split recipes and things
switch liblua5.1 to libluajit5.1
internal configure, make and install
remove # infront of ./configure
Will you pass travis?
typo*
FC001: Use strings in preference to symbols to access node attributes
Added back the ko-ignore related code.
minor tweak to top alignment
Warn if ctl is not a fifo

Ordinary files are not supported and cause problems, so close the fd and
print a warning instead. Thanks to Sergey Bronnikov for the initial
patch.
Initial '/' Breaks Eclipse
增补 ZQ 为热心蠎人
fixed indentation bug in autocomplete; autocomplete now stable
Disallowing /user/ from being indexed.
Some changes to the JSP form.

(Like making it actually work)
Better sync icon.
replaced text message with visual indicator of search progress, updated Gemfile.lock
Totems: don't need an extra button
Added support to not load high res images into memory
invalid objectID string gives more details