labofsahil/github-event-dataset-2012 huggingface dataset:
Added a proper methodology for configuring how cache strings are shown.
解码器
fixed bug w multiple operators
Update TESTE.txt
UT设置界面简化， 选择组功能未实现

Signed-off-by: ElmerNing <ffxhina@gmail.com>
Merge branch 'master' of github.com:wangzhengwei/StripChart-V2
Merge branch 'master' of github.com:wangzhengwei/StripChart-V2
Merge branch 'master' of github.com:wangzhengwei/StripChart-V2
nothing

Signed-off-by: ElmerNing <ffxhina@gmail.com>
nothing

Signed-off-by: ElmerNing <ffxhina@gmail.com>
Merge branch 'master' of github.com:wangzhengwei/StripChart-V2

Conflicts:
	label/probe.cpp
patching services
IOS SDK Commit
IOS SDK update
More fluid animations.
Presenteer now accepts "transition" option. Additionally, animation now works for Opera.
Small changes.
minified.
Merge branch 'master' of git@github.com:willemmulder/Presenteer.js.git
I think this is working now.
clearing on buttons
adding class to text element, so can add sizes
Site updated at 2012-11-12 21:31:52 UTC
Bootstrap update

Updated bootstrap to 2.1.0 - added less files and modified them for
WiseExposition design. Compiled css from less.
Modified css so that blue highlights go to bottom of nav bar.

Modified css so that blue highlights go to bottom of nav bar.
Modified css so that blue highlights go to bottom of nav bar.

Modified css so that blue highlights go to bottom of nav bar.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store

Signed-off-by: Dave Wise <wiseoff@gmail.com>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	css/.DS_Store
	css/_notes/dwsync.xml
	css/bootstrap-responsive.css
	css/bootstrap.css
	less/navbar.less
	less/variables.less

Signed-off-by: Dave Wise <wiseoff@gmail.com>
Updated bootstrap and bootstrap-responsive.

Fixed some merge conflicts related to sizing of window and the navbar.

Signed-off-by: Dave Wise <wiseoff@gmail.com>
Fixed merge issues

Fixed merge issues in the less directory - responsive and variables. Recompiled the css file.

Signed-off-by: Dave Wise <wiseoff@gmail.com>
Merge pull request #3 from davewise/master

Fixed merge issues.
close #49 with adding the mac QuNeo Editor executable
Merge branch 'dev'
Updated to work on mc 1.2.3 builds of craftbukkit
Made the classpath use my new nickname
Site updated at 2012-08-23 14:35:02 UTC
Coomit after merge ;)
Added leaflet to map frameworks
brcm_patchram_plus: read (RHOD) bdaddr from another path on .35

Change-Id: Iacbe0c1deb816c6afbd4b9a16d3fd3ae95c78eb0
Downloading dictionary via Service on background and showing progress through Progress bar and Notifications. Working Datbase class with databse on exteternal storage.

Signed-off-by: Jaroslav Klech <jarek.klech@seznam.cz>
使用pelican‘
updated
moduleの有無のエラー処理追加。
Added helloWorld controller.
1. 配置部分
2. 好友部分
3. 会员部分
4. 任务部分
5. 公告部分
6. 通用部分
7. 通用返回结果
improve font size for readability
番組一覧画面で番組再生準備中にインジケータを表示するように変更
番組詳細画面のレイアウト変更
- renamed settlerRelativeCoordinates#setValue parameters;
Initial plugin structures.
Ease the line drawing plugin usage
Keep window and cursor position when switching buffers
Synchronize X11 clibpoards
Add better unicode support via an alternate font
Site updated at 2012-05-08 08:09:27 UTC
Fixed click handler for more links
Finished first draft of proof for Week 11 Problem 6
Updated _posts/articles/2012-10-18-me.md
Adds a quick way to auto-generate a blog post
Added local mvn deploy profile

	Added "localDeploy" which is activated by setting
	the property localDeployRepo to the relative path
	of the staging repository (a git repo in this case)

	mvn -DlocalDeployRepo="../zenlambda-mvn-repo" deploy
Added a README.md
Cleaned Binaries, added README
Moved 3.16-3.22 changes to docs/HISTORY.txt.
Preparing release 3.34
Back to development: 3.35
Site updated at 2012-05-25 16:20:29 UTC
Site updated at 2012-04-10 03:27:55 UTC
change main page info
Don't display comments link for post excerpts on index page when comments for that post are set to false.
updated to latest version of Sass, fixed deprecation warnings
Fixed “3rd party plugins” wiki page link

Signed-off-by: Brandon Mathis <brandon@imathis.com>
Octopress filters are now limited to html producing templating languages, Fixes #536
Merge pull request #499 from lukekarrys/patch-1

Don't display comments link for post excerpts on index page when comments for that post are set to false
Updated Gemfile
updated plugins to work with latest version of Liquid
Do not strip trailing slash of canonical URLs.

Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Merge pull request #592 from omasanori/fix-rel-canonical

Do not strip trailing slash of canonical URLs.
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.

Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
Example repo URL - see Github issue 516
Merge pull request #666 from nathanl/example_repo_url

Example repo URL - see Github issue 516
Updated gems and rubies to 1.9.3
Merge branch 'master' of github.com:imathis/octopress
Fix for issue #622

The filters bundled with Octopress are not applied to files ending in 
`.md`, because the match in octopress_filters.rb does not match `.md`.
Merge pull request #706 from Confusion/patch-1

Fix for issue #622
associations post
updated octopress
Clear cache manifest on two-factor-auth change
Site updated at 2012-10-22 02:32:01 UTC
Suspend #14 part 3 and Remove focus border
formats dialog changed
checking if argument already has format
selection argument befor add format
selection argument befor add format
problems with depends project files and indexes fixed
fixed problem with index file path
localization updated
fixed bug with no argument name in formats dialog
fixed bug with multiformat logs
index refreshing after block size changing
fixed bug with bad location of vscroll when switching visualizations
bug with hscroll in visualizations fixed - bad position after moving to next page
fixed bug with quick search panel invisible when switching visualizations
bookmarks logic implemented
localization updated
Fixed: real time scroll
test voor de nieuwe directories
opravy viz. nize

- spatna podminka pro pridani noveho auta - nebylko pocitano s auty
ktere jsou v zakrytu a problem v okamziku noveho auta
- oprava prirazovani aut a centroidu
- jeste je tam stale chyba
fix unnamed variable issue
"updating images 2012-09-28"
This is a test edit
Bla Bla
Merge pull request #1 from Batch1211/test-branch

Test branch
friend screen v0
Fixed Pager Merge Errors

Also fixed some NullReference potentials
Merge branch 'test-abs' of github.com:BrandroidTools/OpenExplorer into test-abs
Add 'reminder' fo new meta to get appropriate tests
Rename ItemStackTests to ItemStackTest to actually run
Fixed EntityDamageByEntityEvent to call for every entity. Fixes BUKKIT-1129 and Fixes BUKKIT-1054.
Allow FileSource and ZipFileSource to be declared as children of
C24ItemReaders via XML config. Avoids needing to worry about scoping of
BufferedReaderSources and prevents pollution of ApplicationContext
Synchronize initialise methods. Although it is expected that only a single ItemReader will be using (and hence initialising) a (Zip)FileSource, we can't prevent multiple readers from using them. There are still negative consequences to having multiple threads initialise the (Zip)FileSource a race condition on line skipping is avoided.
Allow item-writer to have its writer source declared as a nested element
Documented up ability to specify Sources and WriterSources as child elements of C24ItemReaders and C24ItemWriters. Updated examples to use this format.
Fix FindBugs warnings, add comments prior to release.
Updated versions ready for release.
WIP integrating FindBugs and JaCoCo into build process.
Move JaCoCo and FindBugs config to parent
Completed integration of JaCoCo and FindBugs.
FindBugs runs automatically as part of a mvn site.
JaCoCo requires -Dcoverage.skip=false on the command line and generates stats as part of test, producing report during site.
Fixed FindBugs warnings
Prototype for autocomplete in search
add second part kernel builder

Change-Id: I658a8175ef189df84a75d4d53165177658550160
updating online tasks
Merge branch 'master' of https://github.com/CMPUT301F12T02/classproject

Conflicts:
	ca.ualberta.cmput301project.MainActivity/bin/ca.ualberta.cmput301project.MainActivity.apk
	ca.ualberta.cmput301project.MainActivity/bin/classes.dex
	ca.ualberta.cmput301project.MainActivity/bin/classes/ca/ualberta/cmput301project/ExternalTaskManager$addTask.class
	ca.ualberta.cmput301project.MainActivity/bin/classes/ca/ualberta/cmput301project/ExternalTaskManager.class
	ca.ualberta.cmput301project.MainActivity/bin/classes/ca/ualberta/cmput301project/ExternalTaskManagerTest.class
	ca.ualberta.cmput301project.MainActivity/bin/classes/ca/ualberta/cmput301project/RequestSummary.class
	ca.ualberta.cmput301project.MainActivity/bin/classes/ca/ualberta/cmput301project/ViewExternalTask.class
	ca.ualberta.cmput301project.MainActivity/bin/resources.ap_
	ca.ualberta.cmput301project.MainActivity/src/ca/ualberta/cmput301project/ExternalTaskManager.java
	ca.ualberta.cmput301project.MainActivity/src/ca/ualberta/cmput301project/RequestSummary.java
	ca.ualberta.cmput301project.MainActivity/src/ca/ualberta/cmput301project/ViewExternalTask.java
added factory system to allow allocation to occur in only one place, plus keep abstraction barriers between different parts of the system. Combined state manager and game classes, may separate them again later. now can easily add more states. Added si_data.h, which contains an enum to describe all game entities, maintain this as entities are added.
Added '!' for 'Clearspike Dashbaord' image.
4.0.4 sources
Fix signature in readme
Gallerie implementiert.
gitignore angepasst.
Simple authentication and session code.
Moves the lever collission detection

Moves the collission detection for the lever so that it is now more representative of the actual lever, rather than including the base
Fixes tooltip bug

Fixes a bug whereby if a clone was on a tooltip then it wouldn't disapear, even if the player moved to another tooltip
Adds selected image

Adds an image to denote that the clone has been selected so that it's now less confusing when managing multiple clones
Merge pull request #13 from hobnob/features/bugFixes

Moves the lever collission detection
File paths implemented as strings.
progress on AStar
Found a path successfully.
Auto Auction Final Version
Auto Auction Final Version
Update docs/INSTALL.md
test datasets
Merge branch 'master' of github.com:Ecotrust/madrona-priorities
Increase image reload attempts
increase tilestache logging level
Merge branch 'juniper-blm'
sample apache site config
get the stache dir from the app name on import
Merge remote-tracking branch 'origin/juniper-blm'
Merge branch 'juniper-blm'
make a logs dir
gitignore
Make proportion a percentage; prep for raw slider values
accordion header css
Raw values for slider bars; fixes #15
styling with different slider settings
show raw values in target report
Check for acronyms when deslugifying
modify readme
adding some sugar
Adds a couple slides
Merge pull request #202 from EternalWind/master

Fixed the signal connection for the advanced pong sample.
Networking fixed!
removed unused files for player
Update World.java! Still one error left to do with OPacket53BlockChange which someone else needs to figure out please. May still be some things wrong.
unversionning db
review + templates + new icon
add french locale
use proper HTTP codes for redirection

 On branch master

	modified:   lib/application.coffee
	modified:   test/test-handler.coffee
added hotplug governor
einige kleine BugFixes
Merge branch 'master' of https://github.com/FrecherxDachs/PhysicsEngine
Removing mongodb from master
Added VillageProtection.java
Added Text.java
Added Metrics.java
nickname was duplicated on first time user signup
PolicyIteration should work. Not tested yet.
Merge branch 'master' of git+ssh://github.com/GiorgosMethe/PredatorVsPrey

Conflicts:
	src/agentsPack/Agent.java
Trashed API page
Fix for issue 5, enumerations not initializing
Authentication and users
one more test to make sure min works
add average and some more tests
New solution has been created

Let's begin fun!
bump: 0.0.147
bump: 0.0.148
merge version_file and version_tag
missing ensure_git_tag_available
write version to tmp file
debugging
debugging
forgot to pop off version argument
bump: 0.0.149
outsource bundler to bin/bundle-ruby and bundle-node
bump: v0.0.200
vagrant 1.0
Updating set cookie method

Setting cookies to route domain and increasing lifetime
Add handler adapter for monolog handler
initializing repo with ignore file
Merge branch 'prod' of github.com:ITS-UofIowa/cgrer.uiowa.edu into prod
adding readme.md
edits cont.
adding cgrer_theme
Moving theme to themes folder
Adding fusion theme
Adding to gitignore
footer top border bar
fixed bug in recommender
remove old related method
fix related
added related view in issue view
TRIVIAL remove dependency on REST API from Infinidat management (will require permissions in future versions)
Updating viral_assembly and VIGOR xml and py
Update 1140gs/2-col-r-fluid.css
[ADD] Immutable node wrapper/proxies.
[MOD] IVisitor now only defined for the immutable nodes.
[MOD] Minor API changes in AbsAxis.
Fix: really fix tests on travis
Instruction length decoder rejects invalid full extension word addressing modes properly now, & has Musashi compatibility mode

The full extension word decoding would throw errors before for undefined variations. Now those are flagged as invalid instructions instead.

Musashi decodes some invalid instructions as being valid. It's unclear why - perhaps the actual CPUs accept those instructions? There is now a #define to toggle the length decoder's behaviour between the manual's and Musashi's, until this is sorted out.
Removed unnecessary debug print
more threads -> faster
Initial ActuarialFunctions commit
- Attempt to fix blacked out action bar
debut kirsch
[OPENENGSB-3011] added new queryForModels method where no timestamp string is needed. It just takes the actual timestamp as base.
[OPENENGSB-3012] made a smarter parameter check for the timestamp string parameter of queryForModels
[OPENENGSB-3010] Fix a setup problem in datasource

Signed-off-by: Andreas Pieber <anpieber@gmail.com>
[OPENENGSB-1931] create connector jpa persistence
[OPENENGSB-1931] change persistence config for connector backend
[OPENENGSB-1931] change creation strategy of ORM to 'add' from 'build'
Merge pull request #124 from Lacrymology/master

Fixes #123
Fixes #122 - avoid exception when taking ticket.
fix frozen models in migrations 0004+0005
Fix RSS feeds for post-Django 1.2. Closes #129.
Merge pull request #127 from brente/fix-migrations

fix frozen models in migrations 0004+0005
Increment version number
Update demo site URL
Re-run makemssages && compilemssages
Remove closing </label> tag that do not match any opening <label>
remove closing </dt> tags for unopened <dt>. and close <dl>
remove closing </label> tag for unopened <label>.
close ul BEFORE closing div
close ul BEFORE closing div
Merge pull request #131 from ochagnon/patch-1

HTML fixes
Merge pull request #132 from ochagnon/master

other html fixes
fix ticket update with no due date set
Italian email templates revision
Merge pull request #133 from brente/master

Ticket update with no due date set fails
Merge pull request #136 from brente/i18n

Italian email templates revision
Add Django 1.4 support - remove old feeds import (no longer required) and add Timezone support. Fixes #135.
Screenshot file added
Created aistatemachine library and moved files.
Cleanup of some unnecessary dependencies.
Change mainloop to no longer use gIdleCallbacks
Update of a few <edit> comments.

While comparing this function with v-d, I realized that
I editted these instances for Singularity, so I might
as well update the <edit> comments to be a bit more correct.
Not saying that there aren't other <edit> comments
still missing futher into the function.
WIP: work on rewriting LLURLRequest
Merge branch 'curlthreading2' into curlthreading3

Conflicts:
	indra/llmessage/llcurlrequest.cpp

Header file include changes collided. Fixed.
More work in progress
WIP
Merge branch 'curlthreading2' into curlthreading3
WIP
Merge branch 'curlthreading2' into curlthreading3
Merge branch 'curlthreading2' into curlthreading3

Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
Merge branch 'curlthreading2' into curlthreading3
WIP: make everything use AICurlEasyRequestStateMachine
Cherry pick from curlthreading2
Cherry pick from curlthreading2
Merge branch 'curlthreading2' into curlthreading3
Merge remote-tracking branch 'github/master'
Merge branch 'curlthreading2' into curlthreading3
Merge branch 'curlthreading2' into curlthreading3
Put back original test.cpp
Reimplement pages sorting
Add old wowhead site support (Locale.Old)
Started work on Random Graphics demo
Moved Chosen-Taxonomy-Metabox to external file
Revert "Updated URL for post-receive hook."

This reverts commit 4f5f611d247db6b3df11a2a5bda0957d08f11d6f.
Moved bisection to autoload/vam/bisect.vim
Improved bisection:
  Improved bisect#StepBad:
    1. there is $MYVIMRC variable, no need to have a big bunch of has() checks.
    2. made it use proper ! escaping.
  Fixed bisect#Bisect: seems nobody cared to test whether it actually accepts arguments
  Improved bisect#Bisect: it now uses v:progname to determine vim executable name
  Improved documentation: added a note about how the problem can be tested automatically
Renamed project and package structure accordingly
Implemented Entity descriptions
Ported tropical pack. Ready to start on the game :D
#final versie 1.1
#slider is trager
activated text coverage report
make sure charsObj is not null
Update README.md
Merge pull request #1 from rahul286/patch-1

Update README.md
mv unit files to unit/
changing dir struct
Create posts och blogs klart V.0.8
emacs backup files all in one place
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

* branches/rudder/2.3:
  Fix reporting for generic variable definition PT. Fixes #2416
  Fix a few typos. Refs #2297 #2415

Conflicts:
	techniques/fileDistribution/copyGitFile/1.3/metadata.xml
Add a sample metadata.xml file to help explain creating techniques. Refs #2423
Refs #2154: Fixed the indentation of the recently added reports on the dnsConfiguration PT
Fixes #2218: There was some extra statements forgotten during the PT repairation
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4
Merge branch 'branches/rudder/2.4' of github.com:Normation/rudder-techniques into branches/rudder/2.4
Upgrade cfengine_stdlib.cf. Fixes #2599
Merge branch 'branches/rudder/2.4' of github.com:Normation/rudder-techniques into branches/rudder/2.4
testingload_class
- connected the user input(unit container names) to settings page in main editor area
- changed some core functions in authorNav.js (shorter code)
fixed merge again ^^;
minor misc tweaks
Add saturday title
Did something ;)
remodelando directorios.
Fix equals check for pfblocker rule loading

Sorry guys - I missed out an equals sign here, the logic ended up only applying rules to the first interface, and not for others.
Merge pull request #325 from phil-davis/master

Fix equals check for pfblocker rule loading
Fix inconsistent field names
Fix inconsistent field names

and default values, and some field description text.
Merge pull request #326 from phil-davis/master

bandwidthd inconsistent field names and defaults
Add export option for OpenVPN 2.3 beta client as well as the existing one.
freeradius2: add some checks on xmlrpc code
Update config/dansguardian/dansguardian.php
Write client install exe to temp dir

The code did not work on nanobsd, due to $workdir templates being on a read-only mount point. The appropriate $client_install_exe needs to be written straight to $tempdir rather than first done in $workdir templates. And also we don't want to be writing to $workdir templates every time we make a client install package for someone.
Merge pull request #328 from phil-davis/master

Write client install exe to temp dir
Merge pull request #327 from rjcrowder/master

Dansguardian blacklist download fix for shallalist
refs #8: language cleanup, code cleanup
mostrar encuesta
Add max value for LTE, HSPA, HSDPA, HSUPA, EVDO rev B.
Assign TCP buffer thresholds
Getting the old header back, changing strategy
home layout restored, menu fixed, dates fixed
analytics
Merge branch 'master' into layout_home
base: added call for proposals
Merge branch 'layout_home'
Forgot a file + small changes
New providers
Config for new providers.
Remove unused options
Remove debug logging.
Move to Unix EOL marker.
Remove default app icon from directory object.
Add program version info to commandline interface.
Bump version to 0.1.4.
Fix a few omissions in Copycat's "no copy" list.
Fix some omissions in the No Metronome list.
Implement Triple Kick.
Give Healer, Hydration, and Shed Skin their proper end-of-turn priorities.
Fix Intimidate not triggering Defiant.
Fix Trick, Switcheroo, and Bestow removing items even when they fail.
Include Ataraxia's avatar.
Nomenclature change: "ranked" -> "rated"
Prevent users from changing their nicknames while participating in a rated battle.
Update README:
> - "only supports singles battles"
> - mention NoScript as a possible pitfall for local testing; suggest Chrome
> - rephrase plans for hosting entirely local servers
Properly implement Defiant.
Fix PotD letting two of the same Pokemon be on a team.
Implement Soundproof.
Flag punching moves so that they get boosted by Iron Fist.
Mention singles only in README
Check PotD template validity before continuing
Merge branch 'master' of https://github.com/Zarel/Pokemon-Showdown
Bumble-Bee's fix for DSP
Add sockproxy doc
Jenkins post build $BUILD_TAG update
11/15.
Adding better shell config scripts and hiding ssh login messages
Adding hostname
change focusing
closing feature #2994
imported files can be removed from their original path
Adding some screenshots
Adding warning on Mac OS X for localhost
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
fixing bug #3004
Feature #2829. Now the integration of the Aurore's work with mine userpanel prototype is almost finished. Some details are on the way
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into feature-2829
Feature #2829. The integration of the Aurore's work is finished. By the process, some additional JQuery plugins were introduced: smartpaginator to paginate a list of items and breadcrumb, a custom breadcrumb trail implementation, to render the current navigation trail of the user. Beside that, a silverpeas-profile.js javascript file was also created to manage both the user groupsand the user profiles in client side (for instance if provides only the functionalities required by the user panel , nevertheless it can be extended to cover other requirements)
fixing bug #3025
Preventing NullPointerException during group synchronization...
Updating stable version to 5.8.1
Feature #2829. Add a new filter in the user panel to fetchs the user's relationships (its contacts within the Silverpeas social network)
To fix bug #3019, removing old stuff about useless container/content concept
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into feature-2829
Feature #2829. Fix the last discovered issues and improve the user search by using the UserDAO instead of the ugly UserTable
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core into feature-2829
fixing bug #3040
Taking into account new format of xmlcomponent and new subdirectory of workflows
Simplifying generation of xmlcomponent (removing editComponentDescriptor.jsp)
Removing a lot of Java warnings
Adding integration tests
fixing bug #3046
using commons.io.FileUtils to create file in case of directory does not exist
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
Removing dependency on old pdfbox version
Restructuring the configuration pages
Completed Owl
Reenabled features from previous commit
A simple connection and query example for sql server.
Fix infinite looping when given bad parameters
Rebuild extension binary.
Overlay:Delete overlay trebuchet not used

Change-Id: I3620dff957af2df49c32433fddc112244034eeb0
Updated v1.6 BeastMode Kernel for Ace
vendor: add Xperia T maintainers

Change-Id: Ie899a466f9588f4f4f084f1ed2332d3b74e9a17c
Merge "vendor: add Xperia T maintainers" into jellybean
LatinIME: Bulgarian predictive dictionary

Change-Id: I7bfbc856303fb146c1eac83630fa4afe1026c243
jenkins: remove p3113 and p5113 (dedup)

Change-Id: Ide3148beb08c7b297d693a1e58b0b76ebf576715
update samsung maintainers

Change-Id: I011e7fd48cca5d0b2dc6f47d75e0adf417695e8e
jerkins: enable sony msm7x30 mogami targets

Change-Id: Iaf84dd4b9c8011c9102b6a76ab8de541ac8fb88b
cm: Update Android version in changelog

Change-Id: I647548e718978563389709653b6ea31d23908eb7
Merge remote-tracking branch 'upstream/jellybean' into jellybean
added blacklisting users per request
06_silly_blocks - first version
Merge branch 'dev'
04 and 05 small fixes
Linked up the UNPROTECTED BlockEventType to the BlockPlacedEventListener.
Updated .gitignore

Added .exe, .ncd, .jhd
Added a CSS3 Button Designer
Merge pull request #302 from konradsroka/master

CSS3 Button Designer
Improving again a new ad page
reset zoneblock allowed types to remove default blocks from list
.
Merge remote-tracking branch 'origin/master'
RSS and IRC views both work and zoom
Facebook sharing now functional.
deleted logout information
added memoryhound
.
added memory hound and there were no leaks! fuck yeah team
use fontSize from fontpanel
default backgroundcolor of labels is clear
added Hex Color Picker plugin, copy this to ~/Library/ColorPickers to get an extra tab in the color picker. opens color picker when doubleclicking R, G or B now
added colorpicker functionality to shadowcolors too
changed uilabel extension, added a setStyle method and a auto-sizing initWithText:andStyle: method
use a separate window for setting shadowoffset, also gives the ability to use degrees/distance instead of x/y
(SQL) Add GetDict and CompareDict for 2 PK tables
Oh shit, I'm dumb...
Input Box and logfile
I'm a bad person.
Merge branch 'master' of github.com:UML-Robotics-Club/igvc-2012
Fixed bug in sectioning.
ADD: Monthly General Kanbe
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
d37 : added 2 new lands Land of Fire III and Land of Eath III thanks to Wingman
d38 fix scroll problem (by yinzanat)
05/02/2012 - yinzanat - added conquest collect (for iron and lumber).
CAAP can now identify guild monsters that are ready to collect.
using https to include jquery-ui.css so there are no unsecure content errors on gifting.
guild monster collect, avoid unsecure content errors on gifting by yinzanat
05/02/2012 - yinzanat - added conquest collect (for iron and lumber).
CAAP can now identify guild monsters that are ready to collect.
using https to include jquery-ui.css so there are no unsecure content errors on gifting.
05/02/2012 - yinzanat	- conquest.js was not pushed in last commit.
Merge branch 'HEAD' of git@github.com:yinzanat/Castle-Age-Autoplayer
05/02/2012 - yinzanat - trying again
Merge pull request #7 from yinzanat/master

added missing file
d39 release
Merge pull request #8 from Vegan/master

Correction to DelayStayHidden feature
d40 : DelayStayHidden feature fix by Vegan
updated crx url
Merge branch 'master' of github.com:magowiz/Castle-Age-Autoplayer
05/03/2012 - yinzanat - added collect now button for conquest.
moved where collect timer was being updated because of timing problems.
d41
A bit more stuff separated
Fixed achtergrondkleur in tabel
Some Sensor and Keyboard changes mainly dealing with Windows Phone development.

The Keyboard class now runs in a Windows Phone environment allowing you
to take input from a phone with a hardware keyboard. You now also have
access to the Motion class by enabling it through the Windows Phone
class. This gives access to all sensors on the phone and automatically
updates them and keeps data held if its enabled.
remove Phonegap.available for Cordova.1.8.1
add getConnect method to the oo.core with some tests
split getConnect into 2 function createConnect and getConnect
update folders tree
add FBConnect
add facebook lib in core test
update oocore
add connect module to the config builder
update get and create Connect
add method getType
update test with the new api
add method getUser
create filetransfer provider
add filetransfer provider and fileinput element
add btn capture
add at method to model
remove comment
update response capture
update filetransfer provider
add createModelClass method
Added jQuery to packages.json dependencies, and modified main.css to put footer on the bottom of the window
Kind of working version of client.
Implementacao da nova animacao de walk para o Merdash caminhar na agua
got the alert dialogs set up using kuntry methods - a lot of staticity introduced - documentation required
screen lock case partially solved
Added licence. Anyone can do with the code as they please. :)
Give up and use buildout
Prevent dht.h being imported multiple times

Added a basic #ifndef DHT_H to the dht.h file so that if you have a
larger program and want to access the sensor from a different file, you
don't import it twice.
Merge pull request #4 from Jearil/master

Adding #ifndef DHT_H to header file
fixing the discovery and sending of files on ubuntu 64bit
fixing up the version on the 32 bit deb
added working sign in and out via railstutorial.org, failing tests
adding working sign-in-out via railstutorial.org, many pending tests, failure of selector recognition
push from netbeans.
Clean up trailing white space and add a missing semicolon
ADD: execution mode to build
Last commit accidentally broke stuff, fixed now.
enable service_down_time option passthrough
fixing stupid webkit font smoothing
fixed adaptive image sizing - it now responds to window width AND height.
Añadidos pequeños cambios y comentarios
I have forgotten to remove the quantity from the products table. Now
it's fixed. For now we can work with negative quantities, but i'm not
sure that this will stay this way.
initial load of alleystats
Fixed shake bug.
added the stub of the server side of the news server
mudanca do buil.xml
#417: Updating changelog.
Template choices verbose name should be determined by the _meta.verbose_name property, and _not_ the key for the the named registry
Minor revision (0.7.1)
Inmplement initial version of xstream convertors for series classes.

This is needed in order to support backward compatibility of job configuration storage.
Typekit font 3
Update client/fileuploader.js

For no JSON response (ONLY xml), please give response text to onComplete.
Don't send an e-mail to that user who is updating/creating the task.
Add guard checks
Update twitter-translate/README.md

Added license
add async avatar loading
和弟弟去外婆家吃饭
和同学出去吃饭聚餐，很开心
爸爸叫我去帮他去干农活，很累人
几个好朋友叫我出去唱歌，唱了好久
和朋友出去逛街，买衣服
弟弟叫我教他做作业
帮着妈妈做家务，开心
舅舅来我家吃饭，我掌勺
中秋，全家人一起赏月
和弟弟，表弟一起去爬山
Merge branch 'master' of http://github.com/appcrews/happy-dual-holiday
[TIDOC-623] Fixed validation errors.
made genres printing alphabetical
Create gh-pages branch via GitHub
Add Test Markdown Page
Try jekyll metadata

take 2
meta data

take 3
typo fix
Document Up
Merge branch 'gh-pages' of https://github.com/assumptionsoup/Learning-Git into gh-pages

Conflicts:
	index.html
added binary for osx and using it when on dev system(osx obviously)
removed ignore to rspec file
index: KVirc uses kvirc.net these days, not .org.
support retina out of the box
Adding DB test scripts for 'posts' table.
Merge branch 'master' of github.com:avshabanov/java-maven-tests
renamed t800 model to head in rt env map example
changed Facebook-Authentication
Update templates-bb + Remove underscore in front of shaders and objects name
[webui] - Fixed show and hide of the issue-spinner in the patchinfo-editor
- Brought tooltipp to add issues up-to-date
Downward speed limit on balloons
Removed the debug button and test link from the main page.
- don't need userid when sending chat thru JS as we can determine the userid from within flash
- refactor to make startup sequence to be deterministic
- make switching presentation and page work
syntax changes to Node methods for clarity
Updated fir database
using the minimized version of the btapp files
submodule updates 2012-04-27
Add a README and a handy script.
cucumber is gross man
Changed the title on the readme
updated example project to use a better naming convention for the main class and its xib file
Renamed files in main code store that people will be using
solved a small bug in level.js
Upgraded Manifest and JSLint'd

Upgraded plugin manifest to 2.0.

JSLint'd, fixing many, many JS issues.

Added new icon.
Icon and JS Tweak

Some small tweaks to get the unit icon to show up
Added the new refresh control
Fixed links to tags and comment pages.
Started with the retrieval of the first resource, but hit a problem wit the SOP.
Merge pull request #2 from caiogondim/master

Adding some popular JS frameworks, client and server-side
Changing page names and logos
New files
Merge branch 'master' of github.com:braziljs/js-the-right-way

Conflicts:
	_posts/30-02-01-Frameworks.md
Little changes
New topic: Testing Tools
I think that Idiomatic is better code style guide 

And that is a good thing to cite JSHint
Merge pull request #3 from leobetosouza/patch-1

I think that Idiomatic is better code style guide 
fix Typo 
Merge pull request #4 from leobetosouza/patch-1

fix typo 
Changing topic name, was inflicting on scroll
Add links to Isaac, OpenShift and JSApp.US
Merge pull request #6 from ricardobeat/patch-1

Add links to Isaac, OpenShift and JSApp.US
Adding functionality to load contributors from GitHub
Adding div to show the contributors from GitHub
Adding YUI as Frameworks
Merge pull request #7 from djalmaaraujo/master

Adding YUI as Frameworks
JavaScript Packages Managers &amp; Public CDN's
Merge pull request #8 from djalmaaraujo/master

avaScript Packages Managers & Public CDN's
typo: "Packages Managers" to "Package Managers"
Setting default_if_none as empty string if no venue specified
Fixed kapteyn output formatting
Test failed for "with" and array of string

This doesn't work :

with('a', 'b);

Should be :

{ a => 0, b => 0}
GOAP
Changed: TOD
added migrations, models, family views, and associations
fixed merge conflicts
Updated doc now that django #16572 is fixed.
Fixed the django master ci pip location
stripped milestone logic out, because it was too complicated - need to fix calc_departure to find the start of day
changed in music_pauser.sh caused previous git rm to fail
Click on Box brings it to the front
Git thinks I made changes

whatev
Bump max Firefox version number up to 14
update to use 2 plus 2 eval
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/Hand.js
	lib/PokerUtil.js
Make test/*.js into a proper testsuite.
missing externs from input.c for rpi make mode
Remove Stetson's file
MOD: factor and interaction .values() return sorted(values)
ENH subp.kit2fiff: raise an error if conversion fails
cleanup
FIX: psyphys.importer.acq load  only channels of a specified sampling rate
Add note mentioning how you can use the API key in place of your heroku password.
WiP - Disable hierarchical repo names

Conflicts:

	app/views/projects/_git_urls.erb
	app/views/repositories/_git_urls.erb
	lib/git_hosting.rb
	lib/git_hosting/patches/repositories_controller_patch.rb
Upgraded to Doctrine 2.2.2
Upgraded to Doctrine 2.2.2
-added the ability to press enter in keyboard instead of sellbutton to
sell
-moved code to from sellallbutton and sellbutton to their own methods to
improve readability
-renamed xml (r.id) sellall_button and sell_button to stick to what I've
been
using before
Powers can apply multiple effects

Combined post_effect, effect_magnitude, and effect_duration.
The new syntax is: `post_effect=id,magnitude,duration`.
So Flare's Blood Strike will have: `post_effect=200,1,150`.
As a result, multiple `post_effect=...` lines are supported per power.

Self-cast effects should no longer use `type=effect`.
Instead, they should use `type=fixed` and `buff=true`, followed by the
relevant `post_effect=...` lines.
Enemies support passive powers

Use `passive_powers=<list of ids>` in an enemy definition file.
Merge pull request #227 from dorkster/powers

Powers can apply multiple effects
Fix slot highlighting when right-clicking to equip

Closes #135
Merge pull request #136 from dorkster/bugfixes

Fix slot highlighting when right-clicking to equip
Clean up errors from StatBlock loading
Use recalc_alt for enemy stats

Closes #226
Merge pull request #228 from dorkster/powers

Support recalc_alt() for enemies
orthography  fix
Move library to match buildr structure
minor language tweak in email notification
Merge branch 'development' of github.com:codeforamerica/blightstatus into development
remove mechanize
provide fema demolitions language
add ability to update the address table
add testing for jruby and rubinius
remove jruby and rubinius from travis for now until further research
support only ruby 1.9.3
Merge branch 'master' into development
add cases filed date
rake lama jobs to update case filed date
decrease size of buttons
[WIP] import addresses from geojson
add data sources message
minor adjustments to progress bar arrows
Merge branch 'development' of github.com:codeforamerica/blightstatus into development
multiple judgements display fix
Merge branch 'development' of github.com:codeforamerica/blightstatus into development
sort cases by status. opened on top
create directory for helpers
poll to csv refactored, working properly now
Updated README with explanation for setting up Tropo and Heroku.
Added Procfile and sample .env file for use with Heroku's Cedar stack or local Foreman development.
Added Testing section to Readme.
Fixed some tests so that now all of them, (other than pending) now pass.
Merge pull request #2 from bensheldon/master-fixes

Fixed tests, more comprehensive readme, Heroku Cedar ready
add documentations
prepare release
prepare release version
missing e-mail address
Guard homepage with session check
Start review; incomplete still
Coerce Multiple FTX lines into a scalar

Fix failing tests in quotefreetext where text was returning
the number of elements rather than the text.
remove unused zcml namespace
Added basic support for SMS notifications in batch editor
Added SMS config
Updated the Mattress Factory installation profile
Merge branch 'master' of github.com:collectiveaccess/providence
account for builders doing a clean checkout

Change-Id: I62c8388c16ba42136525697d82c62af307c8f494
Reviewed-on: http://review.couchbase.org/15791
Tested-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Added makefile for project
Added LICENSE to project.
adding more bio links
break out components into agent/web recipes
content/d3.js getting username and id
close #50. "Zhepki" implemented.
Changed Text Domain and Single Line styles
replaced community button with imgur button
refactored stuff
Made the parser variable "private" and actually use it for parsing
add rotate for sanity check
added factory method
spots are now fetched to fetchedSpots property
Merge remote-tracking branch 'origin/master'
add optimistic locking to the process
address failing test
Merge pull request #496 from fsimonazzi/495-process-optimistic-locking

Implements optimistic locking in the registration process persistence
Added new initializer for conference registration read model.
Added migration initialization to the public website.
Issue #491
Added V3 migration for new column SeatReservationCommandId.
Issue #491
Added migration for new Timestamp column on the process.
Added SQL script to the solution items so it's as easy to inspect it as it is the install-packages.ps1.
Issue #491
add ekiga recipe
import and adopt gegl
those lacking mmx and sse can get fucked
update gegl valac dep
gegl recipe
add libv4l-dev to gegl deps
kill bashism patch
Small file layout tweaks
added ability to run fifos and lifos
Regex fixes
Debug messages
New version.
Put version 0.019 back in.
monster tires option
Merge pull request #2 from david-martin/chat

Websocket chat demo
Strip out fh client code
Fix socket.io/express wrapping logic
Use fixed package versions
Update client/default/js/app.js
Update client/default/index.html
added IDEA files to ignore
reformat
Added W params for Pythia6. Now I'm getting almost pure W+jets samples.
generated kernel for damped oscillator
1.02
Merge https://github.com/digital-chemist/hoverTrackr
Site updated at 2012-11-06 13:02:19 UTC
add new filter to find common peptides by cutoff
add new filter to find common peptides by cutoff
add more filters
Merge branch 'master' of github.com:dimitras/mascot-csv-filters
add more filters
Run on empty queue fatala error fix
package 1
Move sqlite gem to development only and postgres to production only
Wrote MatchDefinition and started writing HandResults tests.
working on quick selection
Fixed program loop. Functional.
Added tutorial functionality to BossSort.
Merge branch 'master' of https://github.com/dpb06/team-boss-development.git
Added tutorials to JUnitTestingData.
DAL updates
Test github username
test github username
test
Being anal here, the phone field is optional
The PaymentDetails & PaymentDetailsItem objects are common between pro & express
Also removed a bunch of duplication
DoReferenceTransaction requires the same PaymentDetails object as everybody else
this also fixes the hardcoded buttonsource & notifyUrl
this seems it should be handled before calling the build method
added support for request details wrapping
adopting the wrapper to concentrate more on the code & < on the boilerplate
Tweaked invoker config
Use requests module for HTTP/HTTPS

* Implement correct certificate verification
* Add --os-cacert
* Rework tests for requests

Pinned requests module to < 1.0 as 1.0.2 is now current in pipi
as of 17Dec2012.

Blueprint: tls-verify

Change-Id: I71066ff7297f3b70c08b7ae1c8ae8b6a1b82bbae
Add clone volume support to cinderclient.

Adds the option to create a clone of a volume, using --source-volid xxx

relies on Change-Id: I72bf90baf22bec2d4806d00e2b827a594ed213f4

Change-Id: Iad2178deb66c328625fbff747e123044f9d86a88
Add list-extensions capability to cinderclient.

Implements the list extension functionality from novaclient
written by harlowja (Change-Id: I5b72f5ea73c00f1c1a0f09f670d744c820e05837)

This provides a mechanism to view available extensions, and also
starts actually using the cinderclient contrib dir.

Original Author: harlowja

Change-Id: I4f9d04cb8a2aa05c978a2a5a926c9175ee3614bb
Merge "Add clone volume support to cinderclient."
add redis configuration.
Implement Feed Logs Screen.
Copy content update
modified settings and title to the view
use object parser value for queries that support it
Add an interface to be implemented by native scripts to be able to explain the score
fix naming, also make explainable search script extend search script
have the quick rolling restart stress test also wait for 0 relocating shards
Changed the title to ryanalynporter.com.
remove template view id and make application's root domNode id unique
split demo css
add favicons
Use a template to configure the server-monitor instead of the non-idempotent execute
Merge pull request #6 from getaroom/server-monitor-template

Use a template to configure the server-monitor instead of the non-idempotent execute - thanks @cgriego!
Updated page for testing
Reformat pom and bring back request logging, add postgres setup instructions
CLC-152 Create lookup tables for class tree metadata
CLC-152 Simplify pg_dump output to minimum required
Merge pull request #32 from shacker/CLC-152

CLC-152 Create lookup tables for class tree metadata
pl-657: Allow to provide additional Maven command-line arguments.
<version>0.2.5-about-fix</version>
update facetly and readme
change sandbag texture and material
commit original eclipse metadata directory
add ignore file
add bin to ignore file
remove bin directory
grenade launcher prototype (extra durable flaming arrow bow for now)
add ModLoader
Agregue el modulo de Stock
Tentativa de correcao de sincronizacao do MIDI
Correcao no carregamento de MIDI's
Implementacao de suporte a eventos de teclado
Correcao de sincronizacao da musica
Implementacao de suporte a carregamento de videos em classes separadas
Implementacao de cache basico para ser usado por recursos internos
Correcao de arquivos do Netbeans
Correcao de conflitos no auto-merge
updated so feature actually passes, re-wrote page_validator to better test validation, and to test it the "1.9" way of doing things, also cleaned up requires
Created RESTClient and adapter layer for server access
Merge branch 'master' of https://github.com/foofighter75/zwarm-frontend
packetLength simplified
Now soundcloud downloads have cover art.
Switches driver to capybara-webkit
More Drupal 7 compliant.

Updated hook_nodeapi to be hook_node_insert and hook_node_update.
Updated the db_affected_rows statement in _views_natureal_sort_store_node to be a single db_merge statement.
basic subversion module
Added basic README file
Added silly .DS_Store file to gitignore list and removed it from the repo
Reorganising commenting

Reorganised commenting of master, mixins and variable files to make it
easier to understanding.
Comment fixes to grids and helpers

Reformatted commenting in Grids and helpers and make some small tweaks
to the code
Added comment "template" to _page and removed _skin
Comment reorganisation of nav, structure

Comment restructure of nav, structure and typo. Added new variable for
column padding. Fixed typography to be inline with typographic scale.
Switched lastcol for firstcol class in grid system.

Margins have always been cancelled on the left on first-child grid unit
elements. However the class was still lastcol. We've now changed this
to be firstcol because that's the right name!
Added brand colours to variables
Added icon fonts switched to compiled normalize
Added icon font and switched to compiled normzlize@
Added normalise css
Responsive Nav styles

Added responsive nab as a clone of Berea Street accessible example.
Tweaks to other files.
Fixed font awesome paths. Fixed responsive nav glitches
DRY Media Queries

Added method to pass currently active media query to JS via CSS pseudo
element. Modified responsive nav to run from this.
Typographic scale

Altered the typographic scale to run with a base of 12px. Not sure if
this is best idea but hey…
Merge branch 'release/release_v02'
SquareBot uses GamerInFight instead of Opponent
Remove global GitModule, GitUICommands
+ ‘cheatsheet/src/cheatsheet-01.png’
+ ‘cheatsheet/src/cheatsheet-02.png’
+ ‘cheatsheet/src/gettingstarted.png’
+ ‘banners/gnome 3.6.svg’
Made error message more obvious
Google style python docstrings.
xy fudge
HDFS-4231. BackupNode: Introduce BackupState. Contributed by Konstantin Shvachko.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416289 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9108. Add a method to clear terminateCalled to ExitUtil for test cases (Kihwal Lee via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1415489 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4233. NN keeps serving even after no journals started while rolling edit. Contributed by Kihwal Lee.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1415502 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-0.23' of github.com:griddynamics/yhadoop-common into gd-branch-0.23
maven properties and profile renamed